diff options
| author | InvincibleDude <81354513+InvincibleDude@users.noreply.github.com> | 2023-03-03 16:49:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-03 16:49:24 +0000 |
| commit | e97b83bdbb852fd2c06ed2ec6c0f92d458e82245 (patch) | |
| tree | 0f0b3779120d602d1d833a50e33c9f73b218f684 /modules/processing.py | |
| parent | 51f81efb02876d24c9e6d844e8c0cbd2384f6514 (diff) | |
| parent | 0cc0ee1bcb4c24a8c9715f66cede06601bfc00c8 (diff) | |
| download | stable-diffusion-webui-gfx803-e97b83bdbb852fd2c06ed2ec6c0f92d458e82245.tar.gz stable-diffusion-webui-gfx803-e97b83bdbb852fd2c06ed2ec6c0f92d458e82245.tar.bz2 stable-diffusion-webui-gfx803-e97b83bdbb852fd2c06ed2ec6c0f92d458e82245.zip | |
Merge branch 'master' into improved-hr-conflict-test
Diffstat (limited to 'modules/processing.py')
| -rw-r--r-- | modules/processing.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/processing.py b/modules/processing.py index 72dd3f6f..25479c06 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -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)
|