diff options
author | Nivesh Rajbhandari | 2012-03-12 16:25:28 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-12 16:25:28 -0700 |
commit | 5fb358d9e80a364d5f300d60b7a9fe0f773741e7 (patch) | |
tree | 2c4d5292b19c91697dffb542f369ec9dcb340f77 /js/tools/ShapeTool.js | |
parent | 5f9b67be3b8bdb391d021103c6bcee6be2f6cdf4 (diff) | |
parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
download | ninja-5fb358d9e80a364d5f300d60b7a9fe0f773741e7.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/tools/ShapeTool.js')
-rwxr-xr-x | js/tools/ShapeTool.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js index 29e9b99f..d3a36163 100755 --- a/js/tools/ShapeTool.js +++ b/js/tools/ShapeTool.js | |||
@@ -14,6 +14,8 @@ var Montage = require("montage/core/core").Montage, | |||
14 | ShapeModel = require("js/models/shape-model").ShapeModel, | 14 | ShapeModel = require("js/models/shape-model").ShapeModel, |
15 | TagTool = require("js/tools/TagTool").TagTool; | 15 | TagTool = require("js/tools/TagTool").TagTool; |
16 | 16 | ||
17 | var World = require("js/lib/drawing/world").World; | ||
18 | |||
17 | exports.ShapeTool = Montage.create(DrawingTool, { | 19 | exports.ShapeTool = Montage.create(DrawingTool, { |
18 | drawingFeedback: { value: { mode: "Draw3D", type: "rectangle" } }, | 20 | drawingFeedback: { value: { mode: "Draw3D", type: "rectangle" } }, |
19 | 21 | ||
@@ -176,7 +178,7 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
176 | if(!world) | 178 | if(!world) |
177 | { | 179 | { |
178 | // create all the GL stuff | 180 | // create all the GL stuff |
179 | var world = new GLWorld(canvas, use3D); | 181 | var world = new World(canvas, use3D); |
180 | ElementMediator.setShapeProperty(canvas, "GLWorld", world); | 182 | ElementMediator.setShapeProperty(canvas, "GLWorld", world); |
181 | } | 183 | } |
182 | 184 | ||