aboutsummaryrefslogtreecommitdiff
path: root/js/tools/Translate3DToolBase.js
diff options
context:
space:
mode:
authorhwc4872012-04-04 16:32:53 -0700
committerhwc4872012-04-04 16:32:53 -0700
commit6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600 (patch)
treef267e05f623ed90d1cc841b8c79a338d6d8e807c /js/tools/Translate3DToolBase.js
parent16f62ca09cc428043e8fef8bdeea11a989e62bc0 (diff)
parent17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff)
downloadninja-6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping
Conflicts: js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js
Diffstat (limited to 'js/tools/Translate3DToolBase.js')
-rwxr-xr-xjs/tools/Translate3DToolBase.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index 32132c9a..4799b840 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -209,7 +209,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
209 this._targets = []; 209 this._targets = [];
210 for(var i = 0; i < len; i++) 210 for(var i = 0; i < len; i++)
211 { 211 {
212 var elt = this.application.ninja.selectedElements[i]._element; 212 var elt = this.application.ninja.selectedElements[i];
213 213
214 var curMat = viewUtils.getMatrixFromElement(elt); 214 var curMat = viewUtils.getMatrixFromElement(elt);
215 var curMatInv = glmat4.inverse(curMat, []); 215 var curMatInv = glmat4.inverse(curMat, []);