diff options
| author | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
| commit | f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch) | |
| tree | 6e04cdf142cb1b36e2197970c9dc2141017a2be7 /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | |
| parent | 9253e2ce98d748edd8c3929f113a597923960387 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/properties.reel/properties.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 dcba51a4..e16e3509 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 | |||
| @@ -247,7 +247,7 @@ exports.ThreeD = Montage.create(Component, { | |||
| 247 | if(els.length) { | 247 | if(els.length) { |
| 248 | return els[0]; | 248 | return els[0]; |
| 249 | } else { | 249 | } else { |
| 250 | return this.boundObject.application.ninja.currentDocument.documentRoot; | 250 | return this.boundObject.application.ninja.currentDocument.model.documentRoot; |
| 251 | } | 251 | } |
| 252 | } | 252 | } |
| 253 | }, | 253 | }, |