Peter M. Groen / dali-demo

Commit 894f8f18e52a8ecccb255788baa2fca6d4e65084

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents dbb97079 ecfef482

Merge "Rename color property of primitive visual to mixColor." into devel/master

Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
examples/primitive-shapes/primitive-shapes-example.cpp
  View file @894f8f1
@@ -318,7 +318,7 @@ public: @@ -318,7 +318,7 @@ public:
318 //Visual map for model 318 //Visual map for model
319 mVisualMap.Clear(); 319 mVisualMap.Clear();
320 mVisualMap[ Visual::Property::TYPE ] = Visual::PRIMITIVE; 320 mVisualMap[ Visual::Property::TYPE ] = Visual::PRIMITIVE;
321 - mVisualMap[ PrimitiveVisual::Property::COLOR ] = mColor; 321 + mVisualMap[ PrimitiveVisual::Property::MIX_COLOR ] = mColor;
322 } 322 }
323 323
324 //Sets the 3D model to a sphere and modifies the sliders appropriately. 324 //Sets the 3D model to a sphere and modifies the sliders appropriately.