From: Seungho BAEK Date: Mon, 9 May 2022 02:17:14 +0000 (+0000) Subject: Merge "Fix glTF loading issue." into devel/master X-Git-Tag: dali_2.1.22~5 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=144dda05c357f536307dc5802dbf5c26cee53c33;hp=3f5a7ea2f13d8cc9e0072111dd196e21cf5505cb Merge "Fix glTF loading issue." into devel/master --- diff --git a/dali-scene-loader/public-api/shader-definition.cpp b/dali-scene-loader/public-api/shader-definition.cpp index 71024f3..1927351 100644 --- 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) { }