aboutsummaryrefslogtreecommitdiff
path: root/js/tools/RectTool.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-02 14:52:14 -0700
committerNivesh Rajbhandari2012-04-02 14:52:14 -0700
commit5377e963c4413640cd3c04e0406384df04144568 (patch)
tree75a6c9e74ad45648f880107609b644bbb65fcc2a /js/tools/RectTool.js
parentc4e83a61311db75c7a1c307553262e77ecaae662 (diff)
downloadninja-5377e963c4413640cd3c04e0406384df04144568.tar.gz
Switching to Linear/RadialGradient materials will set the corresponding color. Also, dispatching an addElement event when toggling shape from WebGL/canvas2d so timeline can draw correctly.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/tools/RectTool.js')
-rwxr-xr-xjs/tools/RectTool.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index d69aa933..0c14a559 100755
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -72,14 +72,14 @@ exports.RectTool = Montage.create(ShapeTool, {
72 { 72 {
73 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); 73 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
74 } 74 }
75 strokeColor = this._getMaterialColor(strokeM) || strokeColor; 75 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
76 76
77 var fillM = this.options.fillMaterial; 77 var fillM = this.options.fillMaterial;
78 if(fillM) 78 if(fillM)
79 { 79 {
80 fillMaterial = Object.create(MaterialsModel.getMaterial(fillM)); 80 fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
81 } 81 }
82 fillColor = this._getMaterialColor(fillM) || fillColor; 82 fillColor = ShapesController.getMaterialColor(fillM) || fillColor;
83 } 83 }
84 84
85 var world = this.getGLWorld(canvas, this.options.use3D); 85 var world = this.getGLWorld(canvas, this.options.use3D);