Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/tools/SelectionTool.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index 07b6d04d..4dca6313 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -195,7 +195,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                         this._targets = [];
                         for(var i = 0; i < len; i++)
                         {
-                                var elt = this.application.ninja.selectedElements[i]._element;
+                                var elt = this.application.ninja.selectedElements[i];
 
                                 var curMat = viewUtils.getMatrixFromElement(elt);
                                 var curMatInv = glmat4.inverse(curMat, []);