diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-04-29 13:10:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-29 13:10:46 +0300 |
| commit | 87535fcf292af8890520e7f346df0f41dd74353a (patch) | |
| tree | 89c7f9ac26ae637f22f2db1efe69fb4aa51e9c70 /modules/img2img.py | |
| parent | 02e351880796422eac3bbaf7aa86332b588651ce (diff) | |
| parent | 1ffb44b0b2c9cb5fb379274515772741a9c1dbaf (diff) | |
Merge branch 'dev' into Branch_AddNewFilenameGen
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"
|