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
[dali_2.0.44] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
image
/
image-visual.h
diff --git
a/dali-toolkit/internal/visuals/image/image-visual.h
b/dali-toolkit/internal/visuals/image/image-visual.h
index
598660f
..
c0a3f75
100644
(file)
--- a/
dali-toolkit/internal/visuals/image/image-visual.h
+++ b/
dali-toolkit/internal/visuals/image/image-visual.h
@@
-233,6
+233,11
@@
protected:
*/
void UpdateShader() override;
*/
void UpdateShader() override;
+ /**
+ * @copydoc Visual::Base::GenerateShader
+ */
+ Shader GenerateShader() const override;
+
public:
/**
* @copydoc AtlasUploadObserver::UploadCompleted
public:
/**
* @copydoc AtlasUploadObserver::UploadCompleted
@@
-315,12
+320,6
@@
private:
*/
void DoSetProperty(Property::Index index, const Property::Value& value);
*/
void DoSetProperty(Property::Index index, const Property::Value& value);
- /**
- * @brief Get a shader for the current properties.
- * @return The shader for the current properties.
- */
- Shader GetShader();
-
private:
Vector4 mPixelArea;
WeakHandle<Actor> mPlacementActor;
private:
Vector4 mPixelArea;
WeakHandle<Actor> mPlacementActor;