fix #3517 breaking txt2img

1 files changed, 19 insertions, 14 deletions

diff --git a/modules/processing.py b/modules/processing.py
index 2a332514..c61bbfbd 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -46,18 +46,23 @@ def apply_color_correction(correction, image):
 

     return image

 

-def apply_overlay(overlay_exists, overlay, paste_loc, image):

-    if overlay_exists:

-        if paste_loc is not None:

-            x, y, w, h = paste_loc

-            base_image = Image.new('RGBA', (overlay.width, overlay.height))

-            image = images.resize_image(1, image, w, h)

-            base_image.paste(image, (x, y))

-            image = base_image

-

-        image = image.convert('RGBA')

-        image.alpha_composite(overlay)

-        image = image.convert('RGB')

+

+def apply_overlay(image, paste_loc, index, overlays):

+    if overlays is None or index >= len(overlays):

+        return image

+

+    overlay = overlays[index]

+

+    if paste_loc is not None:

+        x, y, w, h = paste_loc

+        base_image = Image.new('RGBA', (overlay.width, overlay.height))

+        image = images.resize_image(1, image, w, h)

+        base_image.paste(image, (x, y))

+        image = base_image

+

+    image = image.convert('RGBA')

+    image.alpha_composite(overlay)

+    image = image.convert('RGB')

 

     return image

 

@@ -463,11 +468,11 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
 

                 if p.color_corrections is not None and i < len(p.color_corrections):

                     if opts.save and not p.do_not_save_samples and opts.save_images_before_color_correction:

-                        image_without_cc = apply_overlay(p.overlay_images is not None and i < len(p.overlay_images), p.overlay_images[i], p.paste_to, image)

+                        image_without_cc = apply_overlay(image, p.paste_to, i, p.overlay_images)

                         images.save_image(image_without_cc, p.outpath_samples, "", seeds[i], prompts[i], opts.samples_format, info=infotext(n, i), p=p, suffix="-before-color-correction")

                     image = apply_color_correction(p.color_corrections[i], image)

 

-                image = apply_overlay(p.overlay_images is not None and i < len(p.overlay_images), p.overlay_images[i], p.paste_to, image)

+                image = apply_overlay(image, p.paste_to, i, p.overlay_images)

 

                 if opts.samples_save and not p.do_not_save_samples:

                     images.save_image(image, p.outpath_samples, "", seeds[i], prompts[i], opts.samples_format, info=infotext(n, i), p=p)