diff options
author | hwc487 | 2012-01-31 10:46:48 -0800 |
---|---|---|
committer | hwc487 | 2012-01-31 10:46:48 -0800 |
commit | aa1b4b78d9e1b9cc15529dbf7196b7ac8a88e260 (patch) | |
tree | 9fd0364c371b8c9bbe1620b9a5a58a45dd0574a9 /js/tools | |
parent | 0b8d8b2eb595b64ef53440b949f3c5ec891daf8a (diff) | |
parent | 6066b9bda2990c9d6b4311d221b0d0c773b20f60 (diff) | |
download | ninja-aa1b4b78d9e1b9cc15529dbf7196b7ac8a88e260.tar.gz |
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working
Conflicts:
js/stage/stage.reel/stage.js
Diffstat (limited to 'js/tools')
-rw-r--r-- | js/tools/SelectionTool.js | 1 | ||||
-rw-r--r-- | js/tools/drawing-tool-base.js | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index 5f2a959f..862b2e88 100644 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js | |||
@@ -180,7 +180,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
180 | this._handleMode = null; | 180 | this._handleMode = null; |
181 | this._delta = null; | 181 | this._delta = null; |
182 | this.DrawHandles(); | 182 | this.DrawHandles(); |
183 | console.log( "move: (" + dx + ", " + dy + ")" ); | ||
184 | } | 183 | } |
185 | 184 | ||
186 | this.endDraw(event); | 185 | this.endDraw(event); |
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, { |