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
Modifed mesh-renderer to use new texture API
[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
eac2d89
..
fc75b7a
100644
(file)
--- a/
dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
@@
-639,7
+639,7
@@
int Model3dView::GetShaderProperties( Toolkit::Model3dView::IlluminationType ill
if( illuminationType == Toolkit::Model3dView::DIFFUSE_WITH_NORMAL_MAP )
{
- objectProperties |= ObjLoader::TANGENTS | ObjLoader::BINO
MI
ALS;
+ objectProperties |= ObjLoader::TANGENTS | ObjLoader::BINO
RM
ALS;
}
return objectProperties;