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 "Updated patch coverage script." into devel/master
[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
ca1244b
..
952a824
100644
(file)
--- a/
dali-scene-loader/public-api/material-definition.cpp
+++ b/
dali-scene-loader/public-api/material-definition.cpp
@@
-100,6
+100,11
@@
Sampler SamplerFlags::MakeSampler(Type flags)
return sampler;
}
return sampler;
}
+TextureDefinition::TextureDefinition(const std::string& imageUri, SamplerFlags::Type samplerFlags)
+: mImageUri(imageUri),
+ mSamplerFlags(samplerFlags)
+{}
+
MaterialDefinition::RawData
MaterialDefinition::LoadRaw(const std::string& imagesPath) const
{
MaterialDefinition::RawData
MaterialDefinition::LoadRaw(const std::string& imagesPath) const
{