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
Changes following "Remove Sampler scene object"
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
atlas-manager
/
atlas-manager.h
diff --git
a/dali-toolkit/internal/atlas-manager/atlas-manager.h
b/dali-toolkit/internal/atlas-manager/atlas-manager.h
index
2c7f192
..
6d41419
100644
(file)
--- a/
dali-toolkit/internal/atlas-manager/atlas-manager.h
+++ b/
dali-toolkit/internal/atlas-manager/atlas-manager.h
@@
-389,13
+389,13
@@
public:
Material GetMaterial( AtlasId atlas ) const;
/**
Material GetMaterial( AtlasId atlas ) const;
/**
- * @brief Get
Sampler
used by atlas
+ * @brief Get
Image
used by atlas
*
* @param atlas[in] atlas AtlasId
*
* @return Sampler used by atlas
*/
*
* @param atlas[in] atlas AtlasId
*
* @return Sampler used by atlas
*/
-
Sampler GetSampler
( AtlasId atlas ) const;
+
Image GetImage
( AtlasId atlas ) const;
private:
explicit DALI_INTERNAL AtlasManager(Internal::AtlasManager *impl);
private:
explicit DALI_INTERNAL AtlasManager(Internal::AtlasManager *impl);