diff options
author | Armen Kesablyan | 2012-04-04 11:34:19 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-04-04 11:34:19 -0700 |
commit | 211f514882144de8df69ebb2106f3b446be1dda0 (patch) | |
tree | c8eaf3d9fc7ac1bc841320e73d41818fbfb5827d /js/panels/properties.reel/sections | |
parent | 5a5d0f68dd82b829405a0b301dd11b4cf385c8d5 (diff) | |
parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
download | ninja-211f514882144de8df69ebb2106f3b446be1dda0.tar.gz |
Merge branch 'refs/heads/master' into BugFixes
Diffstat (limited to 'js/panels/properties.reel/sections')
-rwxr-xr-x | js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | 2 |
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, { | |||
231 | _getSelectedItem: { | 231 | _getSelectedItem: { |
232 | value: function(els) { | 232 | value: function(els) { |
233 | if(els.length) { | 233 | if(els.length) { |
234 | return els[0]._element || els[0]; | 234 | return els[0]; |
235 | } else { | 235 | } else { |
236 | return this.boundObject.application.ninja.currentDocument.documentRoot; | 236 | return this.boundObject.application.ninja.currentDocument.documentRoot; |
237 | } | 237 | } |