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/OvalTool.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/OvalTool.js')
-rwxr-xr-x | js/tools/OvalTool.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js index 6edec811..f06fadb9 100755 --- a/js/tools/OvalTool.js +++ b/js/tools/OvalTool.js | |||
@@ -53,14 +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 = ShapesController.getMaterialColor(strokeM) || strokeColor; | 56 | strokeColor = ShapesController.getMaterialColor(strokeMaterial) || strokeColor; |
57 | 57 | ||
58 | var fillM = this.options.fillMaterial; | 58 | var fillM = this.options.fillMaterial; |
59 | if(fillM) | 59 | if(fillM) |
60 | { | 60 | { |
61 | fillMaterial = Object.create(MaterialsModel.getMaterial(fillM)); | 61 | fillMaterial = Object.create(MaterialsModel.getMaterial(fillM)); |
62 | } | 62 | } |
63 | fillColor = ShapesController.getMaterialColor(fillM) || fillColor; | 63 | fillColor = ShapesController.getMaterialColor(fillMaterial) || fillColor; |
64 | } | 64 | } |
65 | 65 | ||
66 | var world = this.getGLWorld(canvas, this.options.use3D); | 66 | var world = this.getGLWorld(canvas, this.options.use3D); |