aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-27 15:43:51 -0700
committerNivesh Rajbhandari2012-03-27 15:43:51 -0700
commitb5d16f318e23a98d2b75afb902a7d0da6d18a10d (patch)
treec071597f11ae399fe98661c1ca6a3b86d080db4d /js/controllers/elements
parentb1eb3f5cc37f6e58e765f24221c3f0445a3ee75a (diff)
parent675fffb08f570783f055471501f94fc273de2b9e (diff)
downloadninja-b5d16f318e23a98d2b75afb902a7d0da6d18a10d.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-xjs/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 3f8f27d3..f18801fd 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -274,6 +274,10 @@ exports.ShapesController = Montage.create(CanvasController, {
274 color = this.getShapeProperty(el, "stroke"); 274 color = this.getShapeProperty(el, "stroke");
275 } 275 }
276 276
277 if(!css) {
278 return null;
279 }
280
277 css = this.application.ninja.colorController.colorModel.webGlToCss(color); 281 css = this.application.ninja.colorController.colorModel.webGlToCss(color);
278 return this.application.ninja.colorController.getColorObjFromCss(css); 282 return this.application.ninja.colorController.getColorObjFromCss(css);
279 } 283 }