Fixed job count & single-output grid

1 files changed, 5 insertions, 9 deletions

diff --git a/scripts/outpainting_mk_2.py b/scripts/outpainting_mk_2.py
index 726417e7..633dc119 100644
--- a/scripts/outpainting_mk_2.py
+++ b/scripts/outpainting_mk_2.py
@@ -172,10 +172,6 @@ class Script(scripts.Script):
         if down > 0:

             down = target_h - init_img.height - up

 

-        init_image = p.init_images[0]

-

-        state.job_count = (1 if left > 0 else 0) + (1 if right > 0 else 0) + (1 if up > 0 else 0) + (1 if down > 0 else 0)

-

         def expand(init, count, expand_pixels, is_left=False, is_right=False, is_top=False, is_bottom=False):

             is_horiz = is_left or is_right

             is_vert = is_top or is_bottom

@@ -250,7 +246,7 @@ class Script(scripts.Script):
         batch_count = p.n_iter

         batch_size = p.batch_size

         p.n_iter = 1

-        state.job_count = batch_count

+        state.job_count = batch_count * batch_size * ((1 if left > 0 else 0) + (1 if right > 0 else 0) + (1 if up > 0 else 0) + (1 if down > 0 else 0))

         all_processed_images = []

 

         for i in range(batch_count):

@@ -268,10 +264,11 @@ class Script(scripts.Script):
 

             all_processed_images += imgs

 

-        combined_grid_image = images.image_grid(all_processed_images)

         all_images = all_processed_images

 

-        if opts.return_grid:

+        combined_grid_image = images.image_grid(all_processed_images)

+        unwanted_grid_because_of_img_count = len(all_processed_images) < 2 and opts.grid_only_if_multiple

+        if opts.return_grid and not unwanted_grid_because_of_img_count:

             all_images = [combined_grid_image] + all_processed_images

 

         res = Processed(p, all_images, initial_seed_and_info[0], initial_seed_and_info[1])

@@ -280,8 +277,7 @@ class Script(scripts.Script):
             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)

 

-        if opts.grid_save:

+        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)

 

         return res

-