diff options
author | hwc487 | 2012-05-03 12:57:52 -0700 |
---|---|---|
committer | hwc487 | 2012-05-03 12:57:52 -0700 |
commit | e791a7a821221d206c40427fd2695b42a5bacf5f (patch) | |
tree | ac6c0f7f73c9557f2987dbd5ea081e53b5d3891b /js/tools/RectTool.js | |
parent | 571e4518d9550113d5696a61bbc07be8379ff4ac (diff) | |
parent | 595031cb9ac1dae6b8862e9bd75364b58ee0d4e5 (diff) | |
download | ninja-e791a7a821221d206c40427fd2695b42a5bacf5f.tar.gz |
Merge branch 'Textures' of github.com:ericmueller/ninja-internal into Textures
Diffstat (limited to 'js/tools/RectTool.js')
-rwxr-xr-x | js/tools/RectTool.js | 4 |
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); |