aboutsummaryrefslogtreecommitdiff
path: root/js/tools/Rotate3DToolBase.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-29 15:04:36 -0800
committerValerio Virgillito2012-02-29 15:04:36 -0800
commitb09956e4a9a35c5588cc7cd1f01efb617cbe0884 (patch)
tree49b07dfb52252ac986c567ad5c3a7c39ebcc86e2 /js/tools/Rotate3DToolBase.js
parent551e1f2be11e9e6ab7af17816396b88aafd57dff (diff)
parent2b9f63089534356607ad7e0ddde6f22e42d04f80 (diff)
downloadninja-b09956e4a9a35c5588cc7cd1f01efb617cbe0884.tar.gz
Merge branch 'refs/heads/integration-candidate'
Diffstat (limited to 'js/tools/Rotate3DToolBase.js')
-rwxr-xr-xjs/tools/Rotate3DToolBase.js11
1 files changed, 4 insertions, 7 deletions
diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index aa91b2f4..b04e8b0a 100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -447,16 +447,13 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
447 iMat; 447 iMat;
448 for(var i = 0; i < len; i++) 448 for(var i = 0; i < len; i++)
449 { 449 {
450 // Reset to the identity matrix but retain the rotation values 450 // Reset to the identity matrix
451 item = this._targets[i]; 451 item = this._targets[i];
452 elt = item.elt;
453
454 // Reset to the identity matrix but retain the translation values
455 iMat = Matrix.I(4); 452 iMat = Matrix.I(4);
456 mat = item.mat; 453 mat = item.mat;
457 iMat[12] = mat[12]; 454// iMat[12] = mat[12];
458 iMat[13] = mat[13]; 455// iMat[13] = mat[13];
459 iMat[14] = mat[14]; 456// iMat[14] = mat[14];
460 457
461 dist = this._undoArray[i].dist; 458 dist = this._undoArray[i].dist;
462 459