diff options
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/elements/shapes-controller.js | 9 |
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, { | |||
386 | value: function(el, isFill) { | 386 | value: function(el, isFill) { |
387 | if(isFill) | 387 | if(isFill) |
388 | { | 388 | { |
389 | if(el.elementModel.shapeModel.GLGeomObj.getFillColor) | 389 | return this.application.ninja.colorController.colorModel.webGlToColor(el.elementModel.shapeModel.GLGeomObj.getFillColor()); |
390 | { | ||
391 | return this.application.ninja.colorController.colorModel.webGlToColor(el.elementModel.shapeModel.GLGeomObj.getFillColor()); | ||
392 | } | ||
393 | else | ||
394 | { | ||
395 | return null; | ||
396 | } | ||
397 | } | 390 | } |
398 | else | 391 | else |
399 | { | 392 | { |