X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fvisuals%2Fvisual-properties-devel.h;h=9c9a6284dfd314187a62972b77230801f2135f1e;hb=fb0d31619217589b3da2a9bea27a4adad9d7380a;hp=8f7248fcf4ff06d932624f2eb7bb3e9ff0cc2ec8;hpb=fb545906ceea3a2946c8a451f34ea7da283c4ffe;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/visuals/visual-properties-devel.h b/dali-toolkit/devel-api/visuals/visual-properties-devel.h index 8f7248f..9c9a628 100644 --- a/dali-toolkit/devel-api/visuals/visual-properties-devel.h +++ b/dali-toolkit/devel-api/visuals/visual-properties-devel.h @@ -57,22 +57,30 @@ enum Type /** * @brief The transform used by the visual. * @details Name "transform", type Property::Map. - + * * @note Optional. * @see DevelVisual::Transform::Property */ - TRANSFORM = SHADER + 1, // Dali::Toolkit::Visual::Property::SHADER + 1 + TRANSFORM = SHADER + 1, /** * @brief Enables/disables premultiplied alpha. * The premultiplied alpha is false by default unless this behaviour is modified * by the derived Visual type. - + * * @details Name "premultipliedAlpha", type Property::Boolean. - + * * @note Optional. */ - PREMULTIPLIED_ALPHA = SHADER + 2, // Dali::Toolkit::Visual::Property::SHADER + 2 + PREMULTIPLIED_ALPHA = SHADER + 2, + + /** + * @brief Mix color is a blend color for any visual. + * @details Name "mixColor", type Property::VECTOR4 + * + * @note Optional + */ + MIX_COLOR = SHADER + 3, }; } //namespace Property