Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel cache because they can easily get out of sync with the actual colors and materials. Instead, we will always query the object for these values.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 1 insertions, 8 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index b97d04b0..d1bc1fb7 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -386,14 +386,7 @@ exports.ShapesController = Montage.create(CanvasController, {
         value: function(el, isFill) {
             if(isFill)
             {
-                if(el.elementModel.shapeModel.GLGeomObj.getFillColor)
-                {
-                    return this.application.ninja.colorController.colorModel.webGlToColor(el.elementModel.shapeModel.GLGeomObj.getFillColor());
-                }
-            else
-            {
-                    return null;
-                }
+                return this.application.ninja.colorController.colorModel.webGlToColor(el.elementModel.shapeModel.GLGeomObj.getFillColor());
             }
             else
             {