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

examples/primitive-shapes/primitive-shapes-example.cpp
... ... @@ -318,7 +318,7 @@ public:
318 318 //Visual map for model
319 319 mVisualMap.Clear();
320 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 324 //Sets the 3D model to a sphere and modifies the sliders appropriately.
... ...