diff options
author | Nivesh Rajbhandari | 2012-04-05 15:53:20 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-05 15:53:20 -0700 |
commit | 8122876daad3e5a03b33f522751f3aca354615ca (patch) | |
tree | 1ecaf7a02fc5d04a6d547f074e9eb1febb9d3795 | |
parent | a0f939feceaf3d23a6cd08ed5d7f6b236a5a9bde (diff) | |
download | ninja-8122876daad3e5a03b33f522751f3aca354615ca.tar.gz |
Fix for line tool not working because PI requests fill color for line as well and line shape doesn't have getFillColor method.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rwxr-xr-x | js/controllers/elements/shapes-controller.js | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js index d1bc1fb7..514b1472 100755 --- a/js/controllers/elements/shapes-controller.js +++ b/js/controllers/elements/shapes-controller.js | |||
@@ -386,7 +386,16 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
386 | value: function(el, isFill) { | 386 | value: function(el, isFill) { |
387 | if(isFill) | 387 | if(isFill) |
388 | { | 388 | { |
389 | return this.application.ninja.colorController.colorModel.webGlToColor(el.elementModel.shapeModel.GLGeomObj.getFillColor()); | 389 | // Properties Panel asks for fill color even for shapes that only have strokes |
390 | // Check that shape object has a getFillColor method before getting fills | ||
391 | if(el.elementModel.shapeModel.GLGeomObj.getFillColor) | ||
392 | { | ||
393 | return this.application.ninja.colorController.colorModel.webGlToColor(el.elementModel.shapeModel.GLGeomObj.getFillColor()); | ||
394 | } | ||
395 | else | ||
396 | { | ||
397 | return null; | ||
398 | } | ||
390 | } | 399 | } |
391 | else | 400 | else |
392 | { | 401 | { |