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
Revert "[Tizen] Removed unused macro invocation from shader"
[platform/core/uifw/dali-toolkit.git]
/
dali-scene3d
/
public-api
/
loader
/
shader-manager.cpp
diff --git
a/dali-scene3d/public-api/loader/shader-manager.cpp
b/dali-scene3d/public-api/loader/shader-manager.cpp
index
35ebd63
..
6adb452
100644
(file)
--- a/
dali-scene3d/public-api/loader/shader-manager.cpp
+++ b/
dali-scene3d/public-api/loader/shader-manager.cpp
@@
-118,10
+118,6
@@
ShaderOption MakeOption(const MaterialDefinition& materialDef, const MeshDefinit
option.AddOption(ShaderOption::Type::SKINNING);
option.AddJointMacros(meshDef.mJoints.size());
}
option.AddOption(ShaderOption::Type::SKINNING);
option.AddJointMacros(meshDef.mJoints.size());
}
- else
- {
- option.AddJointMacros(0);
- }
if(MaskMatch(meshDef.mFlags, MeshDefinition::FLIP_UVS_VERTICAL))
{
if(MaskMatch(meshDef.mFlags, MeshDefinition::FLIP_UVS_VERTICAL))
{