aboutsummaryrefslogtreecommitdiff
path: root/js/tools/OvalTool.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/OvalTool.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/OvalTool.js')
-rwxr-xr-xjs/tools/OvalTool.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index 0ad74aa4..c09c9bc7 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -53,12 +53,14 @@ exports.OvalTool = Montage.create(ShapeTool, {
53 { 53 {
54 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); 54 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
55 } 55 }
56 strokeColor = this._getMaterialColor(strokeM) || strokeColor;
56 57
57 var fillM = this.options.fillMaterial; 58 var fillM = this.options.fillMaterial;
58 if(fillM) 59 if(fillM)
59 { 60 {
60 fillMaterial = Object.create(MaterialsModel.getMaterial(fillM)); 61 fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
61 } 62 }
63 fillColor = this._getMaterialColor(fillM) || fillColor;
62 } 64 }
63 65
64 var world = this.getGLWorld(canvas, this.options.use3D); 66 var world = this.getGLWorld(canvas, this.options.use3D);