diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-08 12:14:14 +0000 |
|---|---|---|
| committer | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-08 12:14:14 +0000 |
| commit | b88645d9ebddfa26aaf6ee25519a95c967a23138 (patch) | |
| tree | 8ebe423eb7442d88d63e4d943b25ce040c34cc2e /modules/img2img.py | |
| parent | b0419b60a0b17c03923aa82c2e39b2fa9e28c3dc (diff) | |
| download | stable-diffusion-webui-gfx803-b88645d9ebddfa26aaf6ee25519a95c967a23138.tar.gz stable-diffusion-webui-gfx803-b88645d9ebddfa26aaf6ee25519a95c967a23138.tar.bz2 stable-diffusion-webui-gfx803-b88645d9ebddfa26aaf6ee25519a95c967a23138.zip | |
additional changes for merge conflict for #11337
Diffstat (limited to 'modules/img2img.py')
| -rw-r--r-- | modules/img2img.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/img2img.py b/modules/img2img.py index b8ea3a3c..5e18bab9 100644 --- a/modules/img2img.py +++ b/modules/img2img.py @@ -230,7 +230,7 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s if is_batch:
assert not shared.cmd_opts.hide_ui_dir_config, "Launched with --hide-ui-dir-config, batch img2img disabled"
- process_batch(p, img2img_batch_input_dir, img2img_batch_output_dir, img2img_batch_inpaint_mask_dir, args, to_scale=selected_scale_tab == 1, scale_by=scale_by, img2img_batch_input_dir, img2img_batch_output_dir, img2img_batch_inpaint_mask_dir)
+ process_batch(p, img2img_batch_input_dir, img2img_batch_output_dir, img2img_batch_inpaint_mask_dir, args, to_scale=selected_scale_tab == 1, scale_by=scale_by, use_png_info=img2img_batch_input_dir, png_info_props=img2img_batch_output_dir, png_info_dir=img2img_batch_inpaint_mask_dir)
processed = Processed(p, [], p.seed, "")
else:
|