diff options
| author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
| commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
| tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | |
| parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@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 | }, |