michael/stable-diffusion-webui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolve conflict

Browse source
This commit is contained in:
Billy Cao 2022-11-06 16:31:44 +08:00
parent b11713ec2a
commit 55ca040958
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/processing.py
View file

@ -422,14 +422,14 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
try:
for k, v in p.override_settings.items():
opts.data[k] = v # we don't call onchange for simplicity which makes changing model impossible
setattr(opts, k, v) # we don't call onchange for simplicity which makes changing model impossible
if k == 'sd_hypernetwork': shared.reload_hypernetworks() # make onchange call for changing hypernet since it is relatively fast to load on-change, while SD models are not
res = process_images_inner(p)
finally: # restore opts to original state
for k, v in stored_opts.items():
opts.data[k] = v
setattr(opts, k, v)
if k == 'sd_hypernetwork': shared.reload_hypernetworks()
return res