Merge "RegisterVisuals has option not to auto stage visual" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / visuals / primitive-visual-properties.h

diff --git a/dali-toolkit/public-api/visuals/primitive-visual-properties.h b/dali-toolkit/public-api/visuals/primitive-visual-properties.h
index a5aac2d..dbf1e5c 100644 (file)
--- a/dali-toolkit/public-api/visuals/primitive-visual-properties.h
+++ b/dali-toolkit/public-api/visuals/primitive-visual-properties.h
@@ -46,12 +46,12 @@ enum
 
   /**
    * @brief The color of the shape.
-   * @details Name "shapeColor", type Property::VECTOR4.
-   * @SINCE_1_1.45
+   * @details Name "mixColor", type Property::VECTOR4.
+   * @SINCE_1_2_4
    * @note Optional. If not specified, the default is Vector4(0.5, 0.5, 0.5, 1.0).
    * @note Applies to ALL shapes.
    */
-  COLOR,
+  MIX_COLOR,
 
   /**
    * @brief The number of slices as you go around the shape.