diff options
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 917da538..e9dc66bb 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(strokeMaterial) || strokeColor; | 56 | strokeColor = ShapesController.getMaterialColor(strokeM) || 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(fillMaterial) || fillColor; | 63 | fillColor = ShapesController.getMaterialColor(fillM) || fillColor; |
64 | } | 64 | } |
65 | 65 | ||
66 | var world = this.getGLWorld(canvas, this.options.use3D); | 66 | var world = this.getGLWorld(canvas, this.options.use3D); |