prevent making grid if there is no need for it #428

This commit is contained in:
AUTOMATIC 2022-09-14 10:34:44 +03:00
parent 21f2a706bb
commit 6bea45d495
1 changed files with 3 additions and 5 deletions

View File

@ -312,16 +312,14 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
state.nextjob() state.nextjob()
unwanted_grid_because_of_img_count = len(output_images) < 2 and opts.grid_only_if_multiple unwanted_grid_because_of_img_count = len(output_images) < 2 and opts.grid_only_if_multiple
if not p.do_not_save_grid and not unwanted_grid_because_of_img_count: if (opts.return_grid or opts.grid_save) and not p.do_not_save_grid and not unwanted_grid_because_of_img_count:
return_grid = opts.return_grid
grid = images.image_grid(output_images, p.batch_size) grid = images.image_grid(output_images, p.batch_size)
if return_grid: if opts.return_grid:
output_images.insert(0, grid) output_images.insert(0, grid)
if opts.grid_save: if opts.grid_save:
images.save_image(grid, p.outpath_grids, "grid", all_seeds[0], all_prompts[0], opts.grid_format, info=infotext(), short_filename=not opts.grid_extended_filename, grid=True, p=p) images.save_image(grid, p.outpath_grids, "grid", all_seeds[0], all_prompts[0], opts.grid_format, info=infotext(), short_filename=not opts.grid_extended_filename, p=p)
devices.torch_gc() devices.torch_gc()
return Processed(p, output_images, all_seeds[0], infotext()) return Processed(p, output_images, all_seeds[0], infotext())