diff options
| author | Jose Antonio Marquez | 2012-06-20 16:47:25 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-20 16:47:25 -0700 |
| commit | 54b15b3c39835ea999d9ddd8038a5531630e266d (patch) | |
| tree | c207d1290be0e894a57b03098bbb7bbe5f2aee86 /js/panels/properties.reel/sections | |
| parent | ba125a7213cc257d648b22afb14f76d43f60d00d (diff) | |
| parent | 392a559e90357d48c910a07617261483b2b45476 (diff) | |
| download | ninja-54b15b3c39835ea999d9ddd8038a5531630e266d.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
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", |