diff options
Diffstat (limited to 'js/controllers/elements/shapes-controller.js')
-rw-r--r-- | js/controllers/elements/shapes-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js index d34644a7..92353f28 100644 --- a/js/controllers/elements/shapes-controller.js +++ b/js/controllers/elements/shapes-controller.js | |||
@@ -168,7 +168,7 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
168 | setColor: { | 168 | setColor: { |
169 | value: function(el, color, isFill) { | 169 | value: function(el, color, isFill) { |
170 | // TODO - Format color for webGL before setting | 170 | // TODO - Format color for webGL before setting |
171 | color = color.webGlColor; | 171 | color = color.webGlColor || color.color.webGlColor; |
172 | if(isFill) | 172 | if(isFill) |
173 | { | 173 | { |
174 | el.elementModel.shapeModel.GLGeomObj.setFillColor(color); | 174 | el.elementModel.shapeModel.GLGeomObj.setFillColor(color); |