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 "Text Drop Shadow sorting fix" into devel/new_mesh
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
atlas-manager
/
atlas-manager.cpp
diff --git
a/dali-toolkit/internal/atlas-manager/atlas-manager.cpp
b/dali-toolkit/internal/atlas-manager/atlas-manager.cpp
index
61c46f5
..
977c8dc
100644
(file)
--- a/
dali-toolkit/internal/atlas-manager/atlas-manager.cpp
+++ b/
dali-toolkit/internal/atlas-manager/atlas-manager.cpp
@@
-136,6
+136,11
@@
Material AtlasManager::GetMaterial( AtlasId atlas ) const
return GetImplementation(*this).GetMaterial( atlas );
}
+Sampler AtlasManager::GetSampler( AtlasId atlas ) const
+{
+ return GetImplementation(*this).GetSampler( atlas );
+}
+
} // namespace Toolkit
} // namespace Dali