aboutsummaryrefslogtreecommitdiffstats
path: root/modules/processing.py
diff options
context:
space:
mode:
authorAUTOMATIC <16777216c@gmail.com>2022-09-09 16:13:40 +0000
committerAUTOMATIC <16777216c@gmail.com>2022-09-09 16:13:40 +0000
commit5b6a585ae58b9fff1c07f3b811c8373e21249887 (patch)
tree3a3bb20c32fba04048d27de7384c97d7e2bfd884 /modules/processing.py
parentefde17e839959b66413b3684d2d922b37caccf33 (diff)
parent17a7477c7282b0ff16fa1232e5922c0a645e4459 (diff)
downloadstable-diffusion-webui-gfx803-5b6a585ae58b9fff1c07f3b811c8373e21249887.tar.gz
stable-diffusion-webui-gfx803-5b6a585ae58b9fff1c07f3b811c8373e21249887.tar.bz2
stable-diffusion-webui-gfx803-5b6a585ae58b9fff1c07f3b811c8373e21249887.zip
Merge remote-tracking branch 'origin/master' into seeds
Diffstat (limited to 'modules/processing.py')
-rw-r--r--modules/processing.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/processing.py b/modules/processing.py
index b91ade17..09680fbf 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -204,8 +204,10 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
generation_params.update(p.extra_generation_params)
generation_params_text = ", ".join([k if k == v else f'{k}: {v}' for k, v in generation_params.items() if v is not None])
+
+ negative_prompt_text = "\nNegative prompt: " + p.negative_prompt if p.negative_prompt else ""
- return f"{p.prompt_for_display or prompt}\n{generation_params_text}".strip() + "".join(["\n\n" + x for x in comments])
+ return f"{p.prompt_for_display or prompt}{negative_prompt_text}\n{generation_params_text}".strip() + "".join(["\n\n" + x for x in comments])
if os.path.exists(cmd_opts.embeddings_dir):
model_hijack.load_textual_inversion_embeddings(cmd_opts.embeddings_dir, p.sd_model)