diff options
| author | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
| commit | 7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch) | |
| tree | ce4e32578e1af4d49b8375933a6b7edd0a095b0f /js/tools/drawing-tool-base.js | |
| parent | 83ac41dd75ec551cdb03252e0bf3081182517d05 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'js/tools/drawing-tool-base.js')
| -rw-r--r-- | js/tools/drawing-tool-base.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js index 6fc34911..cd895102 100644 --- a/js/tools/drawing-tool-base.js +++ b/js/tools/drawing-tool-base.js | |||
| @@ -10,7 +10,6 @@ var Component = require("montage/ui/component").Component; | |||
| 10 | var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager; | 10 | var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager; |
| 11 | var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils; | 11 | var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils; |
| 12 | var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; | 12 | var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; |
| 13 | var Properties3D = require("js/helper-classes/Properties3D").Properties3D; | ||
| 14 | var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils; | 13 | var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils; |
| 15 | 14 | ||
| 16 | exports.DrawingToolBase = Montage.create(Montage, { | 15 | exports.DrawingToolBase = Montage.create(Montage, { |