mirrors/stable-diffusion-webui
1
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2026-01-22 12:30:53 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into improved-hr-conflict-test

Browse source
This commit is contained in:
InvincibleDude 2023-03-03 19:49:24 +03:00 • committed by GitHub
commit e97b83bdbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 297 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/processing.py
View file

@ -624,13 +624,13 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
break
prompts, extra_network_data = extra_networks.parse_prompts(prompts)
if type(p) == StableDiffusionProcessingTxt2Img:
if p.enable_hr and hr_prompts != prompts:
_, hr_extra_network_data = extra_networks.parse_prompts(hr_prompts)
extra_network_data.update(hr_extra_network_data)
if not p.disable_extra_networks:
with devices.autocast():
extra_networks.activate(p, extra_network_data)