diff options
| author | AUTOMATIC <16777216c@gmail.com> | 2023-01-14 16:56:09 +0000 |
|---|---|---|
| committer | AUTOMATIC <16777216c@gmail.com> | 2023-01-14 16:56:09 +0000 |
| commit | a5bbcd215304e0c83ab2b9fe7f172f88536d7629 (patch) | |
| tree | 5c44a862f9aada5a47b364de06e8ad6d6ddcd310 /modules/sd_models.py | |
| parent | 69781031e7473e020b3af4461fdceb20130e56ab (diff) | |
| download | stable-diffusion-webui-gfx803-a5bbcd215304e0c83ab2b9fe7f172f88536d7629.tar.gz stable-diffusion-webui-gfx803-a5bbcd215304e0c83ab2b9fe7f172f88536d7629.tar.bz2 stable-diffusion-webui-gfx803-a5bbcd215304e0c83ab2b9fe7f172f88536d7629.zip | |
fix bug with "Ignore selected VAE for..." option completely disabling VAE election
rework VAE resolving code to be more simple
Diffstat (limited to 'modules/sd_models.py')
| -rw-r--r-- | modules/sd_models.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/sd_models.py b/modules/sd_models.py index e5a0bc63..6a681cef 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -224,7 +224,7 @@ def read_state_dict(checkpoint_file, print_global_state=False, map_location=None return sd
-def load_model_weights(model, checkpoint_info: CheckpointInfo, vae_file="auto"):
+def load_model_weights(model, checkpoint_info: CheckpointInfo):
sd_model_hash = checkpoint_info.calculate_shorthash()
cache_enabled = shared.opts.sd_checkpoint_cache > 0
@@ -277,8 +277,8 @@ def load_model_weights(model, checkpoint_info: CheckpointInfo, vae_file="auto"): sd_vae.delete_base_vae()
sd_vae.clear_loaded_vae()
- vae_file = sd_vae.resolve_vae(checkpoint_info.filename, vae_file=vae_file)
- sd_vae.load_vae(model, vae_file)
+ vae_file, vae_source = sd_vae.resolve_vae(checkpoint_info.filename)
+ sd_vae.load_vae(model, vae_file, vae_source)
def enable_midas_autodownload():
|