diff options
| author | John Mayhew | 2012-02-10 16:04:19 -0800 |
|---|---|---|
| committer | John Mayhew | 2012-02-10 16:04:19 -0800 |
| commit | 730c1e191e36b8ab8dba576c481a6585e0dfa69e (patch) | |
| tree | c86445ff8d1981e97096ec5e9f6cc5301dc9ea40 /js/tools/RotateStage3DTool.js | |
| parent | cde1dd9a9156b9682fdf85ce2cd4acdd94124c37 (diff) | |
| parent | 48977780443d97b9e97b047066639c9056788041 (diff) | |
| download | ninja-730c1e191e36b8ab8dba576c481a6585e0dfa69e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/ninja.reel/ninja.html
Diffstat (limited to 'js/tools/RotateStage3DTool.js')
| -rw-r--r-- | js/tools/RotateStage3DTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js index 6f07adae..ca2a8bf3 100644 --- a/js/tools/RotateStage3DTool.js +++ b/js/tools/RotateStage3DTool.js | |||
| @@ -83,7 +83,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, { | |||
| 83 | captureSelectionDrawn: { | 83 | captureSelectionDrawn: { |
| 84 | value: function(event){ | 84 | value: function(event){ |
| 85 | this._origin = null; | 85 | this._origin = null; |
| 86 | this._targets = null; | 86 | this._targets = []; |
| 87 | this._startOriginArray = null; | 87 | this._startOriginArray = null; |
| 88 | 88 | ||
| 89 | var stage = this.application.ninja.currentDocument.documentRoot; | 89 | var stage = this.application.ninja.currentDocument.documentRoot; |