diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-05-17 20:18:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-17 20:18:56 +0000 |
| commit | 04b4508a66de58c9f3a422fdcad4dd2ec3ad39ce (patch) | |
| tree | 1cb30a63099a69f678d4901b495203b765a6df59 /modules/extra_networks_hypernet.py | |
| parent | 7201d940a4fe664beb9662fadbeade4ee1d788f7 (diff) | |
| parent | b397f63e00bbfbe9087d80abb457aa9a593b181b (diff) | |
| download | stable-diffusion-webui-gfx803-04b4508a66de58c9f3a422fdcad4dd2ec3ad39ce.tar.gz stable-diffusion-webui-gfx803-04b4508a66de58c9f3a422fdcad4dd2ec3ad39ce.tar.bz2 stable-diffusion-webui-gfx803-04b4508a66de58c9f3a422fdcad4dd2ec3ad39ce.zip | |
Merge branch 'dev' into improve-frontend-responsiveness
Diffstat (limited to 'modules/extra_networks_hypernet.py')
| -rw-r--r-- | modules/extra_networks_hypernet.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/extra_networks_hypernet.py b/modules/extra_networks_hypernet.py index d3a4d7ad..aa2a14ef 100644 --- a/modules/extra_networks_hypernet.py +++ b/modules/extra_networks_hypernet.py @@ -1,4 +1,4 @@ -from modules import extra_networks, shared, extra_networks
+from modules import extra_networks, shared
from modules.hypernetworks import hypernetwork
@@ -9,8 +9,9 @@ class ExtraNetworkHypernet(extra_networks.ExtraNetwork): def activate(self, p, params_list):
additional = shared.opts.sd_hypernetwork
- if additional != "" and additional in shared.hypernetworks and len([x for x in params_list if x.items[0] == additional]) == 0:
- p.all_prompts = [x + f"<hypernet:{additional}:{shared.opts.extra_networks_default_multiplier}>" for x in p.all_prompts]
+ if additional != "None" and additional in shared.hypernetworks and len([x for x in params_list if x.items[0] == additional]) == 0:
+ hypernet_prompt_text = f"<hypernet:{additional}:{shared.opts.extra_networks_default_multiplier}>"
+ p.all_prompts = [f"{prompt}{hypernet_prompt_text}" for prompt in p.all_prompts]
params_list.append(extra_networks.ExtraNetworkParams(items=[additional, shared.opts.extra_networks_default_multiplier]))
names = []
|