diff options
| author | Ananya Sen | 2012-06-04 10:43:29 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-04 10:43:29 -0700 |
| commit | 6fb29883329c9c42a8b406128b92c0e6323a47be (patch) | |
| tree | 07f46e88bccf9cdb7d4e6818e1b646b0d19f05b9 /js/panels/properties.reel/properties.html | |
| parent | cf097ec69e35c07ecae5a105ed5eeb78291c9ac2 (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-6fb29883329c9c42a8b406128b92c0e6323a47be.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@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": { |