diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-05-01 11:39:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-01 11:39:46 +0000 |
| commit | 50f63e22472dd532ddd76adb28f29aef46a71a86 (patch) | |
| tree | 6f9c37f302e6bcaf1ce3e1f1913f2db54f3b184e /modules/processing.py | |
| parent | c714300265919e325ae1340459c4866541940687 (diff) | |
| parent | b463b8a12672e010a8c86ea1c73b2c14ae5555d5 (diff) | |
| download | stable-diffusion-webui-gfx803-50f63e22472dd532ddd76adb28f29aef46a71a86.tar.gz stable-diffusion-webui-gfx803-50f63e22472dd532ddd76adb28f29aef46a71a86.tar.bz2 stable-diffusion-webui-gfx803-50f63e22472dd532ddd76adb28f29aef46a71a86.zip | |
Merge branch 'dev' into js-misc-fixes
Diffstat (limited to 'modules/processing.py')
| -rw-r--r-- | modules/processing.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/processing.py b/modules/processing.py index a48fff99..e8808beb 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -498,6 +498,11 @@ def process_images(p: StableDiffusionProcessing) -> Processed: stored_opts = {k: opts.data[k] for k in p.override_settings.keys()}
try:
+ # if no checkpoint override or the override checkpoint can't be found, remove override entry and load opts checkpoint
+ if sd_models.checkpoint_alisases.get(p.override_settings.get('sd_model_checkpoint')) is None:
+ p.override_settings.pop('sd_model_checkpoint', None)
+ sd_models.reload_model_weights()
+
for k, v in p.override_settings.items():
setattr(opts, k, v)
@@ -514,8 +519,6 @@ def process_images(p: StableDiffusionProcessing) -> Processed: if p.override_settings_restore_afterwards:
for k, v in stored_opts.items():
setattr(opts, k, v)
- if k == 'sd_model_checkpoint':
- sd_models.reload_model_weights()
if k == 'sd_vae':
sd_vae.reload_vae_weights()
|