diff options
| author | Nivesh Rajbhandari | 2012-04-18 12:08:46 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-04-18 12:08:46 -0700 |
| commit | fb20a74856a8c272d09d106765eb2e44c883f0c3 (patch) | |
| tree | d41468b2fff52d73c6308de9730c17be05a71394 /js/tools/RotateObject3DTool.js | |
| parent | e2510cba3b75bba78c587d784f39c137c1618369 (diff) | |
| parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
| download | ninja-fb20a74856a8c272d09d106765eb2e44c883f0c3.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into EricMerge
Conflicts:
js/tools/Rotate3DToolBase.js
js/tools/RotateStage3DTool.js
js/tools/Translate3DToolBase.js
js/tools/modifier-tool-base.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/tools/RotateObject3DTool.js')
| -rwxr-xr-x | js/tools/RotateObject3DTool.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/tools/RotateObject3DTool.js b/js/tools/RotateObject3DTool.js index 25de0cd1..55c9586b 100755 --- a/js/tools/RotateObject3DTool.js +++ b/js/tools/RotateObject3DTool.js | |||
| @@ -20,6 +20,7 @@ exports.RotateObject3DTool = Montage.create(Rotate3DToolBase, { | |||
| 20 | 20 | ||
| 21 | _initializeToolHandles: { | 21 | _initializeToolHandles: { |
| 22 | value: function() { | 22 | value: function() { |
| 23 | this.rotateStage = false; | ||
| 23 | if(!this._handles) | 24 | if(!this._handles) |
| 24 | { | 25 | { |
| 25 | this._handles = []; | 26 | this._handles = []; |