aboutsummaryrefslogtreecommitdiff
path: root/js/tools/RectTool.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-30 13:53:47 -0700
committerNivesh Rajbhandari2012-03-30 13:53:47 -0700
commiteae317815e15a7ffc2dd1bd1e39b208eaa02fd2b (patch)
treecae3e2d74529061a04b817ae216c2dbecbb5c5bb /js/tools/RectTool.js
parent80782d5d0721463f716f0a7241afd09a38543199 (diff)
downloadninja-eae317815e15a7ffc2dd1bd1e39b208eaa02fd2b.tar.gz
Update PI and Color Panel to reflect default LinearGradient and RadialGradient materials' colors.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/tools/RectTool.js')
-rwxr-xr-xjs/tools/RectTool.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index c56e4424..d69aa933 100755
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -72,12 +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 76
76 var fillM = this.options.fillMaterial; 77 var fillM = this.options.fillMaterial;
77 if(fillM) 78 if(fillM)
78 { 79 {
79 fillMaterial = Object.create(MaterialsModel.getMaterial(fillM)); 80 fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
80 } 81 }
82 fillColor = this._getMaterialColor(fillM) || fillColor;
81 } 83 }
82 84
83 var world = this.getGLWorld(canvas, this.options.use3D); 85 var world = this.getGLWorld(canvas, this.options.use3D);