diff options
| author | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
| commit | f1d75e5b29661abc4e173adc1f9de2e0cd91df83 (patch) | |
| tree | 796931014054ad6b0647854183f632ffd72ed9ee /js/panels/properties.reel/properties.html | |
| parent | 06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-f1d75e5b29661abc4e173adc1f9de2e0cd91df83.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
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": { |