diff options
| author | AUTOMATIC <16777216c@gmail.com> | 2023-05-18 14:57:16 +0000 |
|---|---|---|
| committer | AUTOMATIC <16777216c@gmail.com> | 2023-05-18 14:57:16 +0000 |
| commit | 5ec2c294ee800fc360f6883340af8b30df850322 (patch) | |
| tree | 02a8a39b08a74b15b31f070ad99edc899769ede8 /modules/generation_parameters_copypaste.py | |
| parent | 3885f8a63e0954ac96e6681aa8b33281f10337a2 (diff) | |
| parent | f5e44364535ccc7efef445dacb6395c3942f2f17 (diff) | |
| download | stable-diffusion-webui-gfx803-5ec2c294ee800fc360f6883340af8b30df850322.tar.gz stable-diffusion-webui-gfx803-5ec2c294ee800fc360f6883340af8b30df850322.tar.bz2 stable-diffusion-webui-gfx803-5ec2c294ee800fc360f6883340af8b30df850322.zip | |
Merge remote-tracking branch 'InvincibleDude/improved-hr-conflict-test' into hires-fix-ext
Diffstat (limited to 'modules/generation_parameters_copypaste.py')
| -rw-r--r-- | modules/generation_parameters_copypaste.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py index f1a2204c..b34046a0 100644 --- a/modules/generation_parameters_copypaste.py +++ b/modules/generation_parameters_copypaste.py @@ -252,7 +252,6 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model if line.startswith("Negative prompt:"):
done_with_prompt = True
line = line[16:].strip()
-
if done_with_prompt:
negative_prompt += ("" if negative_prompt == "" else "\n") + line
else:
@@ -270,6 +269,11 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model else:
res[k] = v
+ if k.startswith("Hires prompt"):
+ res["Hires prompt"] = v[1:][:-1].replace(';', ',')
+ elif k.startswith("Hires negative prompt"):
+ res["Hires negative prompt"] = v[1:][:-1].replace(';', ',')
+
# Missing CLIP skip means it was set to 1 (the default)
if "Clip skip" not in res:
res["Clip skip"] = "1"
|