fix #3517 breaking txt2img (6cbb04f7) · Commits · github_fork / Stable Diffusion Webui

modules/processing.py

+19 −14

Original line number	Diff line number	Diff line
		@@ -46,8 +46,13 @@ def apply_color_correction(correction, image):

		return image

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

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