aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2023-08-19 08:26:39 +0300
committerGitHub <noreply@github.com>2023-08-19 08:26:39 +0300
commit5590be7a8ce386142bf9dc38819944e4029c5774 (patch)
treeab0a29896def3fbe4e487cf4fcfadad15c36baff
parentf084e6bbd0833040f0dc77318475b18da60ae200 (diff)
parent640cb1bb8dfbd05a3927753090bc80fb5b9737b1 (diff)
Merge pull request #12644 from AUTOMATIC1111/fix-model-override-logic
fix model override logic
-rwxr-xr-xmodules/processing.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/modules/processing.py b/modules/processing.py
index ea481fab..d4926524 100755
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -702,11 +702,8 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
stored_opts = {k: opts.data[k] for k in p.override_settings.keys()}
try:
- # after running refiner, the refiner model is not unloaded - webui swaps back to main model here
- if shared.sd_model.sd_checkpoint_info.title != opts.sd_model_checkpoint:
- sd_models.reload_model_weights()
-
# if no checkpoint override or the override checkpoint can't be found, remove override entry and load opts checkpoint
+ # and if after running refiner, the refiner model is not unloaded - webui swaps back to main model here, if model over is present it will be reloaded afterwards
if sd_models.checkpoint_aliases.get(p.override_settings.get('sd_model_checkpoint')) is None:
p.override_settings.pop('sd_model_checkpoint', None)
sd_models.reload_model_weights()