projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove 3D layer from ModelView
[platform/core/uifw/dali-toolkit.git]
/
dali-scene3d
/
internal
/
controls
/
model-view
/
model-view-impl.h
diff --git
a/dali-scene3d/internal/controls/model-view/model-view-impl.h
b/dali-scene3d/internal/controls/model-view/model-view-impl.h
index
e17dde3
..
10d04f2
100644
(file)
--- a/
dali-scene3d/internal/controls/model-view/model-view-impl.h
+++ b/
dali-scene3d/internal/controls/model-view/model-view-impl.h
@@
-115,11
+115,6
@@
private:
void OnSceneDisconnection() override;
/**
void OnSceneDisconnection() override;
/**
- * @copydoc Toolkit::Control::OnInitialize()
- */
- void OnInitialize() override;
-
- /**
* @copydoc Toolkit::Control::GetNaturalSize
*/
Vector3 GetNaturalSize() override;
* @copydoc Toolkit::Control::GetNaturalSize
*/
Vector3 GetNaturalSize() override;
@@
-167,7
+162,6
@@
private:
private:
std::string mModelPath;
std::string mResourcePath;
private:
std::string mModelPath;
std::string mResourcePath;
- Dali::Layer mModelLayer;
Dali::Actor mModelRoot;
std::vector<AnimationData> mAnimations;
std::vector<WeakHandle<Actor>> mRenderableActors;
Dali::Actor mModelRoot;
std::vector<AnimationData> mAnimations;
std::vector<WeakHandle<Actor>> mRenderableActors;