diff options
author | Valerio Virgillito | 2012-08-15 14:52:25 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-08-15 14:52:25 -0700 |
commit | 34804fa77191a08fcdaa8ca1992b38e60094f3ae (patch) | |
tree | 9eafadc20bb792b4058572ff1e12440428fe7c74 /js/tools/Translate3DToolBase.js | |
parent | a9ff54e7490761a7c0ad572d060ee386179d11df (diff) | |
parent | c88752d621069b12f978c1fd88ffdd52537a4657 (diff) | |
download | ninja-34804fa77191a08fcdaa8ca1992b38e60094f3ae.tar.gz |
Merge branch 'refs/heads/v0.7.2'
Diffstat (limited to 'js/tools/Translate3DToolBase.js')
-rwxr-xr-x | js/tools/Translate3DToolBase.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js index b5008666..fd275a8a 100755 --- a/js/tools/Translate3DToolBase.js +++ b/js/tools/Translate3DToolBase.js | |||
@@ -166,7 +166,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, | |||
166 | 166 | ||
167 | var len = selectedElements.length, | 167 | var len = selectedElements.length, |
168 | self = this, | 168 | self = this, |
169 | target = selectedElements[0], | 169 | target = this.clickedObject, |
170 | curMat = viewUtils.getMatrixFromElement( target ), | 170 | curMat = viewUtils.getMatrixFromElement( target ), |
171 | matInv = glmat4.inverse(this._startMat, []), | 171 | matInv = glmat4.inverse(this._startMat, []), |
172 | nMat = glmat4.multiply(transMat, this._startMat, [] ); | 172 | nMat = glmat4.multiply(transMat, this._startMat, [] ); |
@@ -180,7 +180,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, | |||
180 | 180 | ||
181 | var shouldUpdateStartMat = true; | 181 | var shouldUpdateStartMat = true; |
182 | 182 | ||
183 | if(this._clickedOnStage || ((this._handleMode === 2) && (len > 1))) | 183 | if(this._clickedOnStage || ((this._handleMode !== null) && (len > 1))) |
184 | { | 184 | { |
185 | shouldUpdateStartMat = false; | 185 | shouldUpdateStartMat = false; |
186 | } | 186 | } |