Revert "Respect when opts.grid_save and/or opts.samples_save are set to false."

This commit is contained in:
Extraltodeus
2023-01-05 15:08:30 +01:00
committed by GitHub
parent f5b454df85
commit 092bf2ac52

View File

@@ -74,14 +74,13 @@ class Script(scripts.Script):
else:
proc.images[0] = write_on_image(proc.images[0], "full prompt")
if opts.samples_save:
images.save_image(proc.images[0], p.outpath_samples, "", proc.seed, proc.prompt, opts.samples_format, info= proc.info, p=p)
images.save_image(proc.images[0], p.outpath_samples, "", proc.seed, proc.prompt, opts.samples_format, info= proc.info, p=p)
unwanted_grid_because_of_img_count = len(proc.images) < 2 and opts.grid_only_if_multiple
if ((opts.return_grid or opts.grid_save) and not p.do_not_save_grid and not unwanted_grid_because_of_img_count) or always_grid:
grid = images.image_grid(proc.images)
proc.images.insert(0,grid)
proc.infotexts.insert(0, proc.infotexts[-1])
if opts.grid_save:
if opts.grid_save or always_grid:
images.save_image(grid, p.outpath_grids, "grid", initial_seed, initial_prompt, opts.grid_format, info=proc.info, short_filename=not opts.grid_extended_filename, p=p, grid=True)
return proc