diff options
| author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
| commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
| tree | 79a88684406d3adf00350246a4da884b97fb0eac /js/tools/Rotate3DToolBase.js | |
| parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
| parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
| download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz | |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/tools/Rotate3DToolBase.js')
| -rw-r--r-- | js/tools/Rotate3DToolBase.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js index 6e17864b..aa91b2f4 100644 --- a/js/tools/Rotate3DToolBase.js +++ b/js/tools/Rotate3DToolBase.js | |||
| @@ -254,7 +254,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, { | |||
| 254 | captureSelectionDrawn: { | 254 | captureSelectionDrawn: { |
| 255 | value: function(event){ | 255 | value: function(event){ |
| 256 | this._origin = null; | 256 | this._origin = null; |
| 257 | this._targets = null; | 257 | this._targets = []; |
| 258 | this._startOriginArray = null; | 258 | this._startOriginArray = null; |
| 259 | 259 | ||
| 260 | var len = this.application.ninja.selectedElements.length; | 260 | var len = this.application.ninja.selectedElements.length; |