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/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
index 35591afa..f72d1ff6 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
@@ -231,7 +231,7 @@ exports.ThreeD = Montage.create(Component, {
     _getSelectedItem: {
         value: function(els) {
             if(els.length) {
-                return els[0]._element || els[0];
+                return els[0];
             } else {
                 return this.boundObject.application.ninja.currentDocument.documentRoot;
             }