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
Merge "DALi Version 2.1.23" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-scene-loader
/
public-api
/
shader-definition.cpp
diff --git
a/dali-scene-loader/public-api/shader-definition.cpp
b/dali-scene-loader/public-api/shader-definition.cpp
index
71024f3
..
1927351
100644
(file)
--- a/
dali-scene-loader/public-api/shader-definition.cpp
+++ b/
dali-scene-loader/public-api/shader-definition.cpp
@@
-38,7
+38,7
@@
ShaderDefinition::ShaderDefinition(const ShaderDefinition& other)
mDefines(other.mDefines),
mHints(other.mHints),
mUniforms(other.mUniforms),
- mUseBuiltInShader(
false
)
+ mUseBuiltInShader(
other.mUseBuiltInShader
)
{
}