mirror of
https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
synced 2025-02-07 06:02:53 +08:00
Merge pull request #12577 from brkirch/fix-vae-near-checkpoint-exception
Fix `sd_vae_as_default` being accessed instead of `sd_vae_overrides_per_model_preferences`
This commit is contained in:
commit
63f881a5f0
@ -160,7 +160,7 @@ def resolve_vae_from_user_metadata(checkpoint_file) -> VaeResolution:
|
|||||||
|
|
||||||
def resolve_vae_near_checkpoint(checkpoint_file) -> VaeResolution:
|
def resolve_vae_near_checkpoint(checkpoint_file) -> VaeResolution:
|
||||||
vae_near_checkpoint = find_vae_near_checkpoint(checkpoint_file)
|
vae_near_checkpoint = find_vae_near_checkpoint(checkpoint_file)
|
||||||
if vae_near_checkpoint is not None and (shared.opts.sd_vae_as_default or is_automatic):
|
if vae_near_checkpoint is not None and (not shared.opts.sd_vae_overrides_per_model_preferences or is_automatic):
|
||||||
return VaeResolution(vae_near_checkpoint, 'found near the checkpoint')
|
return VaeResolution(vae_near_checkpoint, 'found near the checkpoint')
|
||||||
|
|
||||||
return VaeResolution(resolved=False)
|
return VaeResolution(resolved=False)
|
||||||
|
Loading…
Reference in New Issue
Block a user