aboutsummaryrefslogtreecommitdiff
path: root/js/tools/RectTool.js
diff options
context:
space:
mode:
authorEric2012-05-03 12:57:13 -0700
committerEric2012-05-03 12:57:13 -0700
commit595031cb9ac1dae6b8862e9bd75364b58ee0d4e5 (patch)
tree9917be0af29b0d9a346d525a720473007192c3f1 /js/tools/RectTool.js
parent8eac5582b72115969a9f915f4303535c22018033 (diff)
parent20c0d7c1b6e7544da2aee3ade08b73883cd458c1 (diff)
downloadninja-595031cb9ac1dae6b8862e9bd75364b58ee0d4e5.tar.gz
Merge pull request #6 from mqg734/GradientFix
Updated hard-coded linear and radial gradients to use the color values in Linear/RadialGradientMaterials.
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 0c14a559..5865f00d 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 = ShapesController.getMaterialColor(strokeM) || strokeColor; 75 strokeColor = ShapesController.getMaterialColor(strokeMaterial) || 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 = ShapesController.getMaterialColor(fillM) || fillColor; 82 fillColor = ShapesController.getMaterialColor(fillMaterial) || fillColor;
83 } 83 }
84 84
85 var world = this.getGLWorld(canvas, this.options.use3D); 85 var world = this.getGLWorld(canvas, this.options.use3D);