diff options
| author | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
| commit | 278769df00ced8620fd73371e38fe2e43f07ca3b (patch) | |
| tree | deb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/panels/properties.reel/properties.html | |
| parent | 555fd6efa605b937800b3979a4c68fa7eb8666ae (diff) | |
| parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
| download | ninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/properties.reel/properties.html')
| -rwxr-xr-x | js/panels/properties.reel/properties.html | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html index ac0dab5a..b9aa206b 100755 --- a/js/panels/properties.reel/properties.html +++ b/js/panels/properties.reel/properties.html | |||
| @@ -56,7 +56,10 @@ | |||
| 56 | } | 56 | } |
| 57 | }, | 57 | }, |
| 58 | "threeDProperties": { | 58 | "threeDProperties": { |
| 59 | "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]" | 59 | "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]", |
| 60 | "bindings": { | ||
| 61 | "currentDocument": {"<-": "@owner.currentDocument"} | ||
| 62 | } | ||
| 60 | }, | 63 | }, |
| 61 | 64 | ||
| 62 | "CustomSections": { | 65 | "CustomSections": { |