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
[dali_1.2.11] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
model3d-view
/
model3d-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
index
d451976
..
dd90747
100644
(file)
--- a/
dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
@@
-278,7
+278,7
@@
const char* NRMMAP_FRAGMENT_SHADER = MAKE_SHADER(
using namespace Dali;
Model3dView::Model3dView()
-
: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE
) )
+
: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT
) )
{
mIlluminationType = Toolkit::Model3dView::DIFFUSE_WITH_NORMAL_MAP;