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 SetTextureAffectsTransparency as it is not needed
[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
9405ec0
..
f1f7a39
100644
(file)
--- a/
dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
@@
-629,8
+629,7
@@
void Model3dView::LoadTextures()
Image tex0 = ResourceImage::New( imgUrl );
if( tex0 )
{
Image tex0 = ResourceImage::New( imgUrl );
if( tex0 )
{
- size_t index = mMaterial.AddTexture( tex0, "sDiffuse" );
- mMaterial.SetTextureAffectsTransparency(index, false );
+ mMaterial.AddTexture( tex0, "sDiffuse" );
}
}
}
}
@@
-642,8
+641,7
@@
void Model3dView::LoadTextures()
Image tex1 = ResourceImage::New( imgUrl );
if (tex1)
{
Image tex1 = ResourceImage::New( imgUrl );
if (tex1)
{
- size_t index = mMaterial.AddTexture( tex1, "sNormal" );
- mMaterial.SetTextureAffectsTransparency(index, false );
+ mMaterial.AddTexture( tex1, "sNormal" );
}
}
}
}
@@
-655,8
+653,7
@@
void Model3dView::LoadTextures()
Image tex2 = ResourceImage::New( imgUrl );
if( tex2 )
{
Image tex2 = ResourceImage::New( imgUrl );
if( tex2 )
{
- size_t index = mMaterial.AddTexture( tex2, "sGloss" );
- mMaterial.SetTextureAffectsTransparency(index, false );
+ mMaterial.AddTexture( tex2, "sGloss" );
}
}
}
}
}
}