diff options
author | Nivesh Rajbhandari | 2012-03-27 11:47:43 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-27 11:47:43 -0700 |
commit | 6d03f6716104bf5b5daf9c8399623797e1672c89 (patch) | |
tree | 215b54eee4d6f982809087c59cf8f1d37b2f4350 /js/controllers/elements | |
parent | 5d055d9fd20a2f4e5078bd722513ce905e9a6146 (diff) | |
download | ninja-6d03f6716104bf5b5daf9c8399623797e1672c89.tar.gz |
Reverting change for IKNinja-1355 because it is causing line tool to fail.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-x | js/controllers/elements/shapes-controller.js | 4 |
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 | } |