aboutsummaryrefslogtreecommitdiff
path: root/js/tools/Rotate3DToolBase.js
diff options
context:
space:
mode:
authorhwc4872012-02-29 15:26:29 -0800
committerhwc4872012-02-29 15:26:29 -0800
commitcf32843b1d64c631e6e7c808cc4f13ac316e1baf (patch)
tree24009d69864151a36ddcf19a617aa6161f15e211 /js/tools/Rotate3DToolBase.js
parent07c48708a99b94a220c043ad5951a331bbd4fc2d (diff)
parenta89e30ab834a48be32b6122e0c8ac1e0c3ed43e8 (diff)
downloadninja-cf32843b1d64c631e6e7c808cc4f13ac316e1baf.tar.gz
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integration
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