diff options
author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
tree | c51112223ceb9121cd595a60335eb2795215590f /js/stage/stage-deps.js | |
parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/stage/stage-deps.js')
-rwxr-xr-x[-rw-r--r--] | js/stage/stage-deps.js | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index 7c6d58b4..d46e2b81 100644..100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js | |||
@@ -4,18 +4,15 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | var Montage = require("montage/core/core").Montage, | 7 | var Montage = require("montage/core/core").Montage, |
8 | Component = require("montage/ui/component").Component; | 8 | Component = require("montage/ui/component").Component, |
9 | 9 | snapManager = require("js/helper-classes/3D/snap-manager").SnapManager, | |
10 | var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager; | 10 | viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils, |
11 | var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils; | 11 | drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils, |
12 | var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils; | 12 | ElementPlanes = require("js/helper-classes/3D/element-planes").ElementPlanes, |
13 | var ElementPlanes = require("js/helper-classes/3D/element-planes").ElementPlanes; | 13 | MathUtilsClass = require("js/helper-classes/3D/math-utils").MathUtilsClass, |
14 | var MathUtilsClass = require("js/helper-classes/3D/math-utils").MathUtilsClass; | 14 | VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils, |
15 | var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; | 15 | DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase; |
16 | |||
17 | //TODO : This dependency needs to be reworked | ||
18 | var DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase; | ||
19 | 16 | ||
20 | exports.StageDeps = Montage.create(Component, { | 17 | exports.StageDeps = Montage.create(Component, { |
21 | viewUtils: { | 18 | viewUtils: { |