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 "Moved TextureSet::SetImage() to separate devel-api module" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
renderers
/
color
/
color-renderer.h
diff --git
a/dali-toolkit/internal/controls/renderers/color/color-renderer.h
b/dali-toolkit/internal/controls/renderers/color/color-renderer.h
index
70ad107
..
d5c7a94
100644
(file)
--- a/
dali-toolkit/internal/controls/renderers/color/color-renderer.h
+++ b/
dali-toolkit/internal/controls/renderers/color/color-renderer.h
@@
-35,9
+35,9
@@
namespace Internal
*
* The following properties are required for create a ColorRender
*
*
* The following properties are required for create a ColorRender
*
- * | %Property Name
| Type |
- * |-----------------
-
|-------------|
- * |
blend-color
| VECTOR4 |
+ * | %Property Name | Type |
+ * |-----------------|-------------|
+ * |
mixColor
| VECTOR4 |
*/
class ColorRenderer: public ControlRenderer
{
*/
class ColorRenderer: public ControlRenderer
{
@@
-113,8
+113,8
@@
private:
private:
private:
- Vector4 m
Blend
Color;
- Property::Index m
Blend
ColorIndex;
+ Vector4 m
Mix
Color;
+ Property::Index m
Mix
ColorIndex;
};
};