diff options
| author | hwc487 | 2012-05-31 17:11:08 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-31 17:11:08 -0700 |
| commit | 1c445cf5d905f79937998cf2f1115594ea8c1074 (patch) | |
| tree | 35271ad7ffec86fde9102af3dd954fa3a2974582 /js/panels/properties.reel/sections/three-d-view.reel | |
| parent | 335ce503996e3ccbd2909086328d0a31fbd03370 (diff) | |
| parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
| download | ninja-1c445cf5d905f79937998cf2f1115594ea8c1074.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/io/system/ninjalibrary.json
Diffstat (limited to 'js/panels/properties.reel/sections/three-d-view.reel')
| -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 | }, |