diff options
author | Eric | 2012-05-03 12:57:13 -0700 |
---|---|---|
committer | Eric | 2012-05-03 12:57:13 -0700 |
commit | 595031cb9ac1dae6b8862e9bd75364b58ee0d4e5 (patch) | |
tree | 9917be0af29b0d9a346d525a720473007192c3f1 /js/tools/LineTool.js | |
parent | 8eac5582b72115969a9f915f4303535c22018033 (diff) | |
parent | 20c0d7c1b6e7544da2aee3ade08b73883cd458c1 (diff) | |
download | ninja-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/LineTool.js')
-rwxr-xr-x | js/tools/LineTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js index 3e9167fd..61971c33 100755 --- a/js/tools/LineTool.js +++ b/js/tools/LineTool.js | |||
@@ -225,7 +225,7 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
225 | { | 225 | { |
226 | strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); | 226 | strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); |
227 | } | 227 | } |
228 | strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor; | 228 | strokeColor = ShapesController.getMaterialColor(strokeMaterial) || strokeColor; |
229 | } | 229 | } |
230 | 230 | ||
231 | var world = this.getGLWorld(canvas, this.options.use3D); | 231 | var world = this.getGLWorld(canvas, this.options.use3D); |