aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-05 12:12:36 -0700
committerNivesh Rajbhandari2012-04-05 12:12:36 -0700
commit4dc89306c43e86cdac254c81fb9bb3a92eb4a8b9 (patch)
tree9fc9a25696ddaeb1781865ec535b6c65ac985e89 /js/controllers/elements
parent1e2e0a8d04e55c0ecfb0b1b674792b69fb091415 (diff)
downloadninja-4dc89306c43e86cdac254c81fb9bb3a92eb4a8b9.tar.gz
Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel cache because they can easily get out of sync with the actual colors and materials. Instead, we will always query the object for these values.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-xjs/controllers/elements/shapes-controller.js9
1 files changed, 1 insertions, 8 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index b97d04b0..d1bc1fb7 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -386,14 +386,7 @@ exports.ShapesController = Montage.create(CanvasController, {
386 value: function(el, isFill) { 386 value: function(el, isFill) {
387 if(isFill) 387 if(isFill)
388 { 388 {
389 if(el.elementModel.shapeModel.GLGeomObj.getFillColor) 389 return this.application.ninja.colorController.colorModel.webGlToColor(el.elementModel.shapeModel.GLGeomObj.getFillColor());
390 {
391 return this.application.ninja.colorController.colorModel.webGlToColor(el.elementModel.shapeModel.GLGeomObj.getFillColor());
392 }
393 else
394 {
395 return null;
396 }
397 } 390 }
398 else 391 else
399 { 392 {