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
Model3D view to load textures after material changed.
[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
2d75ede
..
38e7d3e
100644
(file)
--- a/
dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
@@
-328,6
+328,7
@@
void Model3dView::SetProperty( BaseObject* object, Property::Index index, const
{
impl.LoadMaterial();
impl.CreateMaterial();
{
impl.LoadMaterial();
impl.CreateMaterial();
+ impl.LoadTextures();
}
break;
}
}
break;
}
@@
-434,7
+435,7
@@
void Model3dView::OnStageConnection( int depth )
if( mObjLoader.IsSceneLoaded() )
{
if( mObjLoader.IsSceneLoaded() )
{
- mMesh = mObjLoader.CreateGeometry( GetShaderProperties( mIlluminationType ) );
+ mMesh = mObjLoader.CreateGeometry( GetShaderProperties( mIlluminationType )
, true
);
CreateMaterial();
LoadTextures();
CreateMaterial();
LoadTextures();
@@
-529,7
+530,7
@@
void Model3dView::CreateGeometry()
{
if( mObjLoader.IsSceneLoaded() )
{
{
if( mObjLoader.IsSceneLoaded() )
{
- mMesh = mObjLoader.CreateGeometry( GetShaderProperties( mIlluminationType ) );
+ mMesh = mObjLoader.CreateGeometry( GetShaderProperties( mIlluminationType )
, true
);
if( mRenderer )
{
if( mRenderer )
{