Merge pull request #9258 from wywywywy/bug-outpainting-mk2-file-format

bug: Outpainting Mk2 & Poorman should use the SAMPLE file format to save images, not GRID file format
This commit is contained in:
AUTOMATIC1111 2023-04-29 17:23:22 +03:00 committed by GitHub
commit 609b8933a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -275,7 +275,7 @@ class Script(scripts.Script):
if opts.samples_save: if opts.samples_save:
for img in all_processed_images: for img in all_processed_images:
images.save_image(img, p.outpath_samples, "", res.seed, p.prompt, opts.grid_format, info=res.info, p=p) images.save_image(img, p.outpath_samples, "", res.seed, p.prompt, opts.samples_format, info=res.info, p=p)
if opts.grid_save and not unwanted_grid_because_of_img_count: if opts.grid_save and not unwanted_grid_because_of_img_count:
images.save_image(combined_grid_image, p.outpath_grids, "grid", res.seed, p.prompt, opts.grid_format, info=res.info, short_filename=not opts.grid_extended_filename, grid=True, p=p) images.save_image(combined_grid_image, p.outpath_grids, "grid", res.seed, p.prompt, opts.grid_format, info=res.info, short_filename=not opts.grid_extended_filename, grid=True, p=p)

View File

@ -138,7 +138,7 @@ class Script(scripts.Script):
combined_image = images.combine_grid(grid) combined_image = images.combine_grid(grid)
if opts.samples_save: if opts.samples_save:
images.save_image(combined_image, p.outpath_samples, "", initial_seed, p.prompt, opts.grid_format, info=initial_info, p=p) images.save_image(combined_image, p.outpath_samples, "", initial_seed, p.prompt, opts.samples_format, info=initial_info, p=p)
processed = Processed(p, [combined_image], initial_seed, initial_info) processed = Processed(p, [combined_image], initial_seed, initial_info)