From: Andrew Poor <andrew.poor@samsung.com>
Date: Tue, 30 Aug 2016 14:44:57 +0000 (+0100)
Subject: [3.0] Rename color property of primitive visual to mixColor.
X-Git-Tag: accepted/tizen/3.0/common/20161114.110133~9
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=b57c3cd944761a29611789fffa3ee097804e7575

[3.0] Rename color property of primitive visual to mixColor.

Change-Id: I804af801240be00969e436982760f582e27346e7
---

diff --git a/examples/primitive-shapes/primitive-shapes-example.cpp b/examples/primitive-shapes/primitive-shapes-example.cpp
index 9329371..89ff58c 100644
--- a/examples/primitive-shapes/primitive-shapes-example.cpp
+++ b/examples/primitive-shapes/primitive-shapes-example.cpp
@@ -318,7 +318,7 @@ public:
     //Visual map for model
     mVisualMap.Clear();
     mVisualMap[ Visual::Property::TYPE           ] = Visual::PRIMITIVE;
-    mVisualMap[ PrimitiveVisual::Property::COLOR ] = mColor;
+    mVisualMap[ PrimitiveVisual::Property::MIX_COLOR ] = mColor;
   }
 
   //Sets the 3D model to a sphere and modifies the sliders appropriately.