aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-31 12:20:03 -0700
committerPushkar Joshi2012-05-31 12:20:03 -0700
commit4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch)
treec5b17297aba04bd54a59cf6214d29486e089031b /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
parent75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff)
parent6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
downloadninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js')
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js2
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 },