hoelee/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2025-08-04 03:10:21 +00:00
Code Issues Actions Packages Projects Releases 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
parent 51f81efb02 0cc0ee1bcb
commit e97b83bdbb
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)