diff options
author | Valerio Virgillito | 2012-08-09 12:51:56 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-08-09 12:51:56 -0700 |
commit | 0674dfbd067403fb7a8534e43985e41ec224c681 (patch) | |
tree | 1133549fe1425197559febdcae1b1b970cd16fba /js/tools/Translate3DToolBase.js | |
parent | fae3f9f0b3f8257208c64a32f8b6f5c9b0082bf9 (diff) | |
parent | 74cda8443e4f3c6f3e29b5bf99c3615339a982a3 (diff) | |
download | ninja-0674dfbd067403fb7a8534e43985e41ec224c681.tar.gz |
Merge branch 'IKNinja_1892' of https://github.com/mqg734/ninja into 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 | } |