diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-08-07 05:07:09 +0000 |
|---|---|---|
| committer | AUTOMATIC1111 <16777216c@gmail.com> | 2023-08-07 05:07:20 +0000 |
| commit | c96e4750d895a47290dc7f96e030197069c75fa4 (patch) | |
| tree | 15bf9a0ad4629ae0c56349f2d1f629ab79c2d134 /modules/sd_models.py | |
| parent | 5a38a9c0eea7f8c77585fcb97c51bf0e103e706e (diff) | |
| download | stable-diffusion-webui-gfx803-c96e4750d895a47290dc7f96e030197069c75fa4.tar.gz stable-diffusion-webui-gfx803-c96e4750d895a47290dc7f96e030197069c75fa4.tar.bz2 stable-diffusion-webui-gfx803-c96e4750d895a47290dc7f96e030197069c75fa4.zip | |
SD VAE rework 2
- the setting for preferring opts.sd_vae has been inverted and reworded
- resolve_vae function made easier to read and now returns an object rather than a tuple
- if the checkbox for overriding per-model preferences is checked, opts.sd_vae overrides checkpoint user metadata
- changing VAE in user metadata for currently loaded model immediately applies the selection
Diffstat (limited to 'modules/sd_models.py')
| -rw-r--r-- | modules/sd_models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/sd_models.py b/modules/sd_models.py index f6051604..d65735e3 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -356,7 +356,7 @@ def load_model_weights(model, checkpoint_info: CheckpointInfo, state_dict, timer sd_vae.delete_base_vae()
sd_vae.clear_loaded_vae()
- vae_file, vae_source = sd_vae.resolve_vae(checkpoint_info.filename)
+ vae_file, vae_source = sd_vae.resolve_vae(checkpoint_info.filename).tuple()
sd_vae.load_vae(model, vae_file, vae_source)
timer.record("load VAE")
|