diff options
| author | Jose Antonio Marquez | 2012-06-20 16:48:34 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-20 16:48:34 -0700 |
| commit | 4eff115126ab946c5852d787fd596e07b156c9a5 (patch) | |
| tree | f7d45b260f2fb5ba5dc4d1879076ca032d5ae2e6 /js/panels/properties.reel/sections | |
| parent | 7615da5c6ba54bd082eac4b8a6d9196084e5c590 (diff) | |
| parent | 392a559e90357d48c910a07617261483b2b45476 (diff) | |
| download | ninja-4eff115126ab946c5852d787fd596e07b156c9a5.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/panels/properties.reel/sections')
| -rwxr-xr-x | js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html index 572e5a60..259e9ab5 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | |||
| @@ -232,7 +232,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 232 | } | 232 | } |
| 233 | }, | 233 | }, |
| 234 | "flattenCheckbox": { | 234 | "flattenCheckbox": { |
| 235 | "prototype": "montage/ui/checkbox.reel", | 235 | "prototype": "montage/ui/input-checkbox.reel", |
| 236 | "properties": { | 236 | "properties": { |
| 237 | "element": {"#": "flattenCh"}, | 237 | "element": {"#": "flattenCh"}, |
| 238 | "identifier": "flatten", | 238 | "identifier": "flatten", |