aboutsummaryrefslogtreecommitdiff
path: root/js/tools/BrushTool.js
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/tools/BrushTool.js
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/tools/BrushTool.js')
-rw-r--r--js/tools/BrushTool.js6
1 files changed, 0 insertions, 6 deletions
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index d71cc743..1365896a 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -334,12 +334,6 @@ exports.BrushTool = Montage.create(ShapeTool, {
334 newCanvas.elementModel.selection = "BrushStroke"; 334 newCanvas.elementModel.selection = "BrushStroke";
335 newCanvas.elementModel.pi = "BrushStrokePi"; 335 newCanvas.elementModel.pi = "BrushStrokePi";
336 newCanvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units; 336 newCanvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
337 var strokeColor = this._selectedBrushStroke.getStrokeColor();
338 newCanvas.elementModel.shapeModel.stroke = strokeColor;
339 if(strokeColor) {
340 newCanvas.elementModel.shapeModel.border = this.application.ninja.colorController.colorToolbar.stroke;
341 }
342 newCanvas.elementModel.shapeModel.strokeMaterial = this._selectedBrushStroke.getStrokeMaterial();
343 337
344 newCanvas.elementModel.shapeModel.GLGeomObj = brushStroke; 338 newCanvas.elementModel.shapeModel.GLGeomObj = brushStroke;
345 newCanvas.elementModel.shapeModel.useWebGl = this.options.use3D; 339 newCanvas.elementModel.shapeModel.useWebGl = this.options.use3D;