aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-13 11:57:04 -0800
committerNivesh Rajbhandari2012-02-13 11:57:04 -0800
commitc0ab12c07d18149e3704d3e5f66aee43c13b7fd0 (patch)
treeffb80ed3d4dca5bcace4d2d4dd811bd2cf42ccda /js
parent297af408e671006366ac72f7eac1f64a5d742117 (diff)
downloadninja-c0ab12c07d18149e3704d3e5f66aee43c13b7fd0.tar.gz
Working around inconsistent color object when getting/setting WebGL values.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js')
-rw-r--r--js/controllers/elements/shapes-controller.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 42c2528f..8953f155 100644
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -249,6 +249,10 @@ exports.ShapesController = Montage.create(CanvasController, {
249 setColor: { 249 setColor: {
250 value: function(el, color, isFill) { 250 value: function(el, color, isFill) {
251 var webGl = color.webGlColor || color.color.webGlColor; 251 var webGl = color.webGlColor || color.color.webGlColor;
252 if(!webGl)
253 {
254 webGl = this.application.ninja.colorController.colorModel.colorToWebGl(color.color);
255 }
252 if(isFill) 256 if(isFill)
253 { 257 {
254 el.elementModel.shapeModel.GLGeomObj.setFillColor(webGl); 258 el.elementModel.shapeModel.GLGeomObj.setFillColor(webGl);