Merge branch 'main_upstream'

# Conflicts:
#	launch.py
#	ldm_patched/modules/args_parser.py
#	modules/config.py
#	presets/anime.json
#	presets/default.json
#	presets/lcm.json
#	presets/realistic.json
This commit is contained in:
Manuel Schmid
2024-01-27 21:09:08 +01:00
60 changed files with 2049 additions and 275 deletions
+2 -1
View File
@@ -155,6 +155,7 @@ def load_parameter_button_click(raw_prompt_txt, is_generating):
return results
def parse_meta_from_preset(preset_content):
assert isinstance(preset_content, dict)
preset_prepared = {}
@@ -182,4 +183,4 @@ def parse_meta_from_preset(preset_content):
if settings_key == "default_styles" or settings_key == "default_aspect_ratio":
preset_prepared[meta_key] = str(preset_prepared[meta_key])
return preset_prepared
return preset_prepared