aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-27 14:27:26 -0700
committerJose Antonio Marquez2012-03-27 14:27:26 -0700
commit57696598cd39d4aa31b5106cba29dd2b6d02c6d9 (patch)
tree215b54eee4d6f982809087c59cf8f1d37b2f4350 /js/controllers/elements
parent7bf738bc08f6a24edce30dbc2b101a8cab2d27aa (diff)
parent675fffb08f570783f055471501f94fc273de2b9e (diff)
downloadninja-57696598cd39d4aa31b5106cba29dd2b6d02c6d9.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
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 5b9e4672..f0e9458b 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 }