diff options
author | Jose Antonio Marquez | 2012-07-24 09:46:47 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-07-24 09:46:47 -0700 |
commit | 2f32323d6d5a65feaaa53461a80fcef297a5b65a (patch) | |
tree | 0956c504a462609f3818052ab6a641c520b12dd5 /js/tools/ShapeTool.js | |
parent | 2952c2465b9a66076344087f899c5c836ad15ad6 (diff) | |
parent | 55a69aeb3c66b533d5a2d27d7548471c2c8b5dfc (diff) | |
download | ninja-2f32323d6d5a65feaaa53461a80fcef297a5b65a.tar.gz |
Merge branch 'refs/heads/Ninja-Master' into Document
Diffstat (limited to 'js/tools/ShapeTool.js')
-rwxr-xr-x | js/tools/ShapeTool.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js index ecc0dca3..e1ca31e6 100755 --- a/js/tools/ShapeTool.js +++ b/js/tools/ShapeTool.js | |||
@@ -167,13 +167,13 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
167 | }, | 167 | }, |
168 | 168 | ||
169 | getGLWorld: { | 169 | getGLWorld: { |
170 | value: function (canvas, use3D) | 170 | value: function (canvas, use3D) { |
171 | { | 171 | var world; |
172 | var world = this.application.ninja.elementMediator.getShapeProperty(canvas, "GLWorld"); | 172 | |
173 | if(!world) | 173 | world = this.application.ninja.elementMediator.getShapeProperty(canvas, "GLWorld"); |
174 | { | 174 | if(!world) { |
175 | // create all the GL stuff | 175 | // create all the GL stuff |
176 | var world = new World(canvas, use3D); | 176 | world = new World(canvas, use3D); |
177 | this.application.ninja.elementMediator.setShapeProperty(canvas, "GLWorld", world); | 177 | this.application.ninja.elementMediator.setShapeProperty(canvas, "GLWorld", world); |
178 | } | 178 | } |
179 | 179 | ||