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
ModelView using scene-loader
[platform/core/uifw/dali-toolkit.git]
/
dali-scene-loader
/
public-api
/
material-definition.cpp
diff --git
a/dali-scene-loader/public-api/material-definition.cpp
b/dali-scene-loader/public-api/material-definition.cpp
index
1766c3f
..
5838da1
100644
(file)
--- 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(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);
if(envTextures.mDiffuse)
{
textureSet.SetTexture(n, envTextures.mDiffuse);
@@
-278,12
+285,6
@@
TextureSet MaterialDefinition::Load(const EnvironmentDefinition::Vector& environ
textureSet.SetSampler(n, specularSampler);
++n;
}
textureSet.SetSampler(n, specularSampler);
++n;
}
-
- // If pre-computed brdf texture is defined, set the texture.
- if(envTextures.mBrdf)
- {
- textureSet.SetTexture(n, envTextures.mBrdf);
- }
}
else
{
}
else
{