Merge branch 'refs/heads/ninja-internal' into WebGLMaterials

1 files changed, 4 insertions, 0 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 3f8f27d3..f18801fd 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -274,6 +274,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                 color = this.getShapeProperty(el, "stroke");
             }
 
+            if(!css) {
+                return null;
+            }
+
             css = this.application.ninja.colorController.colorModel.webGlToCss(color);
             return this.application.ninja.colorController.getColorObjFromCss(css);
         }