Merge branch 'feature/add-pony-support-and-preset' into develop

# Conflicts:
#	webui.py
This commit is contained in:
Manuel Schmid
2024-07-01 23:10:37 +02:00
10 changed files with 50 additions and 19 deletions
+3 -2
View File
@@ -615,7 +615,7 @@ default_inpaint_mask_sam_model = get_config_item_or_set_default(
config_dict["default_loras"] = default_loras = default_loras[:default_max_lora_number] + [[True, 'None', 1.0] for _ in range(default_max_lora_number - len(default_loras))]
# mapping config to meta parameter
# mapping config to meta parameter
possible_preset_keys = {
"default_model": "base_model",
"default_refiner": "refiner_model",
@@ -644,7 +644,8 @@ possible_preset_keys = {
"lora_downloads": "lora_downloads",
"vae_downloads": "vae_downloads",
"default_vae": "vae",
"default_inpaint_method": "inpaint_method"
# "default_inpaint_method": "inpaint_method", # disabled so inpaint mode doesn't refresh after every preset change
"default_inpaint_engine_version": "inpaint_engine_version",
}
REWRITE_PRESET = False