diff options
author | Jon Reid | 2012-03-06 14:14:01 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-06 14:14:01 -0800 |
commit | 60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (patch) | |
tree | 0087ad093418638ff1d0b4362715bd7b2d147eba /js/tools/ShapeTool.js | |
parent | d64f8c9fc1dd5fb15ad78ad61bed1ef3736321bb (diff) | |
parent | 342fb451bd251358068a0dcb10e9dc218b79a176 (diff) | |
download | ninja-60bba95eaffa8b5c741c6c85fb84b327cd75d6c3.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber
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 | ||