diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-04-29 16:50:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-29 16:50:52 +0300 |
| commit | 263f0fb59c7afa9b4739b226725dd0b38956a8cf (patch) | |
| tree | 2ebe6b5e7763ab2c95aa8bd72ce6d8f6afbd87ce /modules/img2img.py | |
| parent | 082613036aa7b9a8a008384b1770046d6714bc28 (diff) | |
| parent | faff08f396f159a5ddd6328a6d2699b7e7d18ef9 (diff) | |
Merge branch 'dev' into remove-watermark-option
Diffstat (limited to 'modules/img2img.py')
| -rw-r--r-- | modules/img2img.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/img2img.py b/modules/img2img.py index c973b770..d22d9a49 100644 --- a/modules/img2img.py +++ b/modules/img2img.py @@ -151,13 +151,14 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s override_settings=override_settings,
)
- p.scripts = modules.scripts.scripts_txt2img
+ p.scripts = modules.scripts.scripts_img2img
p.script_args = args
if shared.cmd_opts.enable_console_prompts:
print(f"\nimg2img: {prompt}", file=shared.progress_print_out)
- p.extra_generation_params["Mask blur"] = mask_blur
+ if mask:
+ p.extra_generation_params["Mask blur"] = mask_blur
if is_batch:
assert not shared.cmd_opts.hide_ui_dir_config, "Launched with --hide-ui-dir-config, batch img2img disabled"
|