diff options
| author | Jonathan Duran | 2012-04-04 11:21:46 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-04 11:21:46 -0700 |
| commit | 04ca16276e73dbd238b42fd898f8b3cccc730f18 (patch) | |
| tree | 95aee6605f1018550875812166d292554830d7ca /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | |
| parent | 61404b1965ffe7011ec86953f853f0954ccc308d (diff) | |
| parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
| download | ninja-04ca16276e73dbd238b42fd898f8b3cccc730f18.tar.gz | |
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>
Diffstat (limited to 'js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js')
| -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 | } |