diff options
| author | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
| commit | c6ae80c488621d4ac189cb63309b6258115f823a (patch) | |
| tree | dfa26112e1830972fcb212bbb5b17c9a901c645f /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | |
| parent | 022e714cb5d10cd8575ab9907eddfb184a990b66 (diff) | |
| parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
| download | ninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html')
| -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", |