diff options
| author | ljleb <lebel.louisjacob@gmail.com> | 2023-09-09 06:06:04 +0000 |
|---|---|---|
| committer | ljleb <lebel.louisjacob@gmail.com> | 2023-09-09 06:06:04 +0000 |
| commit | 349f89302445e094394685c13c1ce95cd14975b8 (patch) | |
| tree | b0495d9294310e3337af3ff469217dbe9601feb7 /modules/img2img.py | |
| parent | 7b44b85730d392733a285fe7e5c9e077f7bbccd3 (diff) | |
| parent | 329c8ab93216f9e77002e68aab418d63d82cd872 (diff) | |
| download | stable-diffusion-webui-gfx803-349f89302445e094394685c13c1ce95cd14975b8.tar.gz stable-diffusion-webui-gfx803-349f89302445e094394685c13c1ce95cd14975b8.tar.bz2 stable-diffusion-webui-gfx803-349f89302445e094394685c13c1ce95cd14975b8.zip | |
Merge branch 'dev' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into fix-counter
Diffstat (limited to 'modules/img2img.py')
| -rw-r--r-- | modules/img2img.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/modules/img2img.py b/modules/img2img.py index c81c7ab9..c1cae22f 100644 --- a/modules/img2img.py +++ b/modules/img2img.py @@ -114,15 +114,17 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal else:
p.override_settings.pop("sd_model_checkpoint", None)
+ if output_dir:
+ p.outpath_samples = output_dir
+ p.override_settings['save_to_dirs'] = False
+ if p.n_iter > 1 or p.batch_size > 1:
+ p.override_settings['samples_filename_pattern'] = f'{image_path.stem}-[generation_number]'
+ else:
+ p.override_settings['samples_filename_pattern'] = f'{image_path.stem}'
+
proc = modules.scripts.scripts_img2img.run(p, *args)
+
if proc is None:
- if output_dir:
- p.outpath_samples = output_dir
- p.override_settings['save_to_dirs'] = False
- if p.n_iter > 1 or p.batch_size > 1:
- p.override_settings['samples_filename_pattern'] = f'{image_path.stem}-[generation_number]'
- else:
- p.override_settings['samples_filename_pattern'] = f'{image_path.stem}'
process_images(p)
|