diff options
author | invincibledude <> | 2023-01-29 16:13:27 +0000 |
---|---|---|
committer | invincibledude <> | 2023-01-29 16:13:27 +0000 |
commit | 6127d2ff1bc5c3bc81d876e6dbc9a60f79aec898 (patch) | |
tree | 138e26a8b7e1a171ba52a1043ba5a8c4273cf48a /modules/processing.py | |
parent | c92ec3a9255a8364f4212d5e7434da1785752737 (diff) | |
download | stable-diffusion-webui-gfx803-6127d2ff1bc5c3bc81d876e6dbc9a60f79aec898.tar.gz stable-diffusion-webui-gfx803-6127d2ff1bc5c3bc81d876e6dbc9a60f79aec898.tar.bz2 stable-diffusion-webui-gfx803-6127d2ff1bc5c3bc81d876e6dbc9a60f79aec898.zip |
Extra networks loading fix
Diffstat (limited to 'modules/processing.py')
-rw-r--r-- | modules/processing.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/processing.py b/modules/processing.py index da890fb3..a56915c5 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -600,7 +600,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed: if not p.disable_extra_networks:
if type(p) == StableDiffusionProcessingTxt2Img:
if p.enable_hr and p.hr_prompt != '':
- extra_networks.activate(p, extra_network_data + hr_extra_network_data)
+ extra_networks.activate(p, extra_network_data | hr_extra_network_data)
else:
extra_networks.activate(p, extra_network_data)
@@ -755,7 +755,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed: if not p.disable_extra_networks:
if type(p) == StableDiffusionProcessingTxt2Img:
if p.enable_hr and p.hr_prompt != '':
- extra_networks.deactivate(p, extra_network_data + hr_extra_network_data)
+ extra_networks.deactivate(p, extra_network_data | hr_extra_network_data)
else:
extra_networks.deactivate(p, extra_network_data)
|