projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "Added GetUniformName to Sampler." into devel/master
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
rendering
/
sampler-impl.cpp
diff --git
a/dali/internal/event/rendering/sampler-impl.cpp
b/dali/internal/event/rendering/sampler-impl.cpp
index
3fb8ca4
..
616e4b5
100644
(file)
--- a/
dali/internal/event/rendering/sampler-impl.cpp
+++ b/
dali/internal/event/rendering/sampler-impl.cpp
@@
-123,6
+123,11
@@
const SceneGraph::Sampler* Sampler::GetSamplerSceneObject() const
return mSceneObject;
}
+SceneGraph::Sampler* Sampler::GetSamplerSceneObject()
+{
+ return mSceneObject;
+}
+
unsigned int Sampler::GetDefaultPropertyCount() const
{
return SAMPLER_IMPL.GetDefaultPropertyCount();