diff options
author | Eric Guzman | 2012-06-20 19:42:03 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-20 19:42:03 -0700 |
commit | 3270aac4980c908f305fb53abadda5121ff6b9cb (patch) | |
tree | 6255aaab239fde71b1f4862dd70de7be62f48b85 /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | |
parent | a5d93daf6fdccbfee160d6a8ba08f6b6d4b9d7cc (diff) | |
parent | 87377c81da06abf6d656017859830a3ab2902f0e (diff) | |
download | ninja-3270aac4980c908f305fb53abadda5121ff6b9cb.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
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", |