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, 2 insertions, 2 deletions

diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index b04e8b0a..eb2cdba4 100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -262,7 +262,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
             {
                 if(len === 1)
                 {
-                    this.target = this.application.ninja.selectedElements[0]._element;
+                    this.target = this.application.ninja.selectedElements[0];
                     drawUtils.addElement(this.target);
 
                     viewUtils.pushViewportObj( this.target );
@@ -311,7 +311,7 @@ exports.Rotate3DToolBase = 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];
 //                this._initProps3D(elt);