aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/elements/shapes-controller.js11
1 files changed, 10 insertions, 1 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index d1bc1fb7..514b1472 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -386,7 +386,16 @@ exports.ShapesController = Montage.create(CanvasController, {
386 value: function(el, isFill) { 386 value: function(el, isFill) {
387 if(isFill) 387 if(isFill)
388 { 388 {
389 return this.application.ninja.colorController.colorModel.webGlToColor(el.elementModel.shapeModel.GLGeomObj.getFillColor()); 389 // Properties Panel asks for fill color even for shapes that only have strokes
390 // Check that shape object has a getFillColor method before getting fills
391 if(el.elementModel.shapeModel.GLGeomObj.getFillColor)
392 {
393 return this.application.ninja.colorController.colorModel.webGlToColor(el.elementModel.shapeModel.GLGeomObj.getFillColor());
394 }
395 else
396 {
397 return null;
398 }
390 } 399 }
391 else 400 else
392 { 401 {