diff options
| author | Jose Antonio Marquez Russo | 2012-01-31 17:40:17 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez Russo | 2012-01-31 17:40:17 -0800 |
| commit | 92ddcf89711c77453a55c4621afb469d61075e96 (patch) | |
| tree | bae583f698d4993c52b31432b598bf4254f59bb0 /js/controllers/elements/shapes-controller.js | |
| parent | b125c02c3d2e28cc9364d16e23791cd6b540f17c (diff) | |
| parent | affafafc4db16e5f918c74dfc919025d4c563cc6 (diff) | |
| download | ninja-92ddcf89711c77453a55c4621afb469d61075e96.tar.gz | |
Merge pull request #1 from mqg734/NiveshColor
Updated color code to handle shapes.
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); |