diff options
author | Ananya Sen | 2012-02-23 13:52:32 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-23 13:52:32 -0800 |
commit | ec3d07c2fea4e79c68606234074f43d694982e5b (patch) | |
tree | dc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /js/tools/modifier-tool-base.js | |
parent | 7283884c39df537694b21419a3ea9e3ca7793b4b (diff) | |
parent | 287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff) | |
download | ninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/document/html-document.js
js/helper-classes/3D/snap-manager.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/tools/modifier-tool-base.js')
-rwxr-xr-x | js/tools/modifier-tool-base.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js index 54bc06be..7d946cb0 100755 --- a/js/tools/modifier-tool-base.js +++ b/js/tools/modifier-tool-base.js | |||
@@ -866,8 +866,8 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
866 | { | 866 | { |
867 | this._handleMode = null; | 867 | this._handleMode = null; |
868 | this._delta = null; | 868 | this._delta = null; |
869 | this.DrawHandles(); | ||
870 | } | 869 | } |
870 | this.DrawHandles(); | ||
871 | } | 871 | } |
872 | }, | 872 | }, |
873 | 873 | ||