diff options
author | Jose Antonio Marquez | 2012-03-02 19:06:37 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-02 19:06:37 -0800 |
commit | 5c49635cc44815364f9a0296ffaa7acc34254937 (patch) | |
tree | d7cb1cd499ab49df4366d776878a8137d662abe4 /js/tools/RectTool.js | |
parent | 5c9795958b08c233eb2c4afab8054d55c3a33d98 (diff) | |
parent | 13f52cf0c74f53a919fa864f86669e8155f82961 (diff) | |
download | ninja-5c49635cc44815364f9a0296ffaa7acc34254937.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/tools/RectTool.js')
-rwxr-xr-x | js/tools/RectTool.js | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js index 31ac7faa..5e148de3 100755 --- a/js/tools/RectTool.js +++ b/js/tools/RectTool.js | |||
@@ -62,16 +62,19 @@ exports.RectTool = Montage.create(ShapeTool, { | |||
62 | var strokeMaterial = null; | 62 | var strokeMaterial = null; |
63 | var fillMaterial = null; | 63 | var fillMaterial = null; |
64 | 64 | ||
65 | var strokeM = this.options.strokeMaterial; | 65 | if(this.options.use3D) |
66 | if(strokeM) | ||
67 | { | 66 | { |
68 | strokeMaterial = Object.create(MaterialsLibrary.getMaterial(strokeM)); | 67 | var strokeM = this.options.strokeMaterial; |
69 | } | 68 | if(strokeM) |
69 | { | ||
70 | strokeMaterial = Object.create(MaterialsLibrary.getMaterial(strokeM)); | ||
71 | } | ||
70 | 72 | ||
71 | var fillM = this.options.fillMaterial; | 73 | var fillM = this.options.fillMaterial; |
72 | if(fillM) | 74 | if(fillM) |
73 | { | 75 | { |
74 | fillMaterial = Object.create(MaterialsLibrary.getMaterial(fillM)); | 76 | fillMaterial = Object.create(MaterialsLibrary.getMaterial(fillM)); |
77 | } | ||
75 | } | 78 | } |
76 | 79 | ||
77 | var world = this.getGLWorld(canvas, this.options.use3D); | 80 | var world = this.getGLWorld(canvas, this.options.use3D); |