X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-scene-loader%2Fpublic-api%2Fmaterial-definition.cpp;h=5838da16b0f29a5aa02f67171615db47e5f902a4;hp=1766c3f9a2fcbef5374fd757bd3ee4406b467b5a;hb=59d7a437c93f4864515c64d0aa3eacaebd293db6;hpb=42e6d93abfd4fc9ced3b9f366ebbc32228aa490b diff --git a/dali-scene-loader/public-api/material-definition.cpp b/dali-scene-loader/public-api/material-definition.cpp index 1766c3f..5838da1 100644 --- a/dali-scene-loader/public-api/material-definition.cpp +++ b/dali-scene-loader/public-api/material-definition.cpp @@ -262,6 +262,13 @@ TextureSet MaterialDefinition::Load(const EnvironmentDefinition::Vector& environ if(mEnvironmentIdx < environments.size()) { auto& envTextures = environments[mEnvironmentIdx].second; + // If pre-computed brdf texture is defined, set the texture. + if(envTextures.mBrdf) + { + textureSet.SetTexture(n, envTextures.mBrdf); + ++n; + } + if(envTextures.mDiffuse) { textureSet.SetTexture(n, envTextures.mDiffuse); @@ -278,12 +285,6 @@ TextureSet MaterialDefinition::Load(const EnvironmentDefinition::Vector& environ textureSet.SetSampler(n, specularSampler); ++n; } - - // If pre-computed brdf texture is defined, set the texture. - if(envTextures.mBrdf) - { - textureSet.SetTexture(n, envTextures.mBrdf); - } } else {