Merge pull request #12588 from catboxanon/fix/inpaint-upload (d09d33bc) · Commits · github_fork / Stable Diffusion Webui

modules/img2img.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s
		mask = None
		elif mode == 2: # inpaint
		image, mask = init_img_with_mask["image"], init_img_with_mask["mask"]
		mask = mask.split()[-1].convert("L").point(lambda x: 255 if x > 128 else 0)
		mask = processing.create_binary_mask(mask)
		image = image.convert("RGB")
		elif mode == 3: # inpaint sketch
		image = inpaint_color_sketch

+9 −1

Original line number	Diff line number	Diff line
		@@ -81,6 +81,12 @@ def apply_overlay(image, paste_loc, index, overlays):

		return image

		def create_binary_mask(image):
		if image.mode == 'RGBA' and image.getextrema()[-1] != (255, 255):
		image = image.split()[-1].convert("L").point(lambda x: 255 if x > 128 else 0)
		else:
		image = image.convert('L')
		return image

		def txt2img_image_conditioning(sd_model, x, width, height):
		if sd_model.model.conditioning_key in {'hybrid', 'concat'}: # Inpainting models
		@@ -1385,7 +1391,9 @@ class StableDiffusionProcessingImg2Img(StableDiffusionProcessing):
		image_mask = self.image_mask

		if image_mask is not None:
		image_mask = image_mask.convert('L')
		# image_mask is passed in as RGBA by Gradio to support alpha masks,
		# but we still want to support binary masks.
		image_mask = create_binary_mask(image_mask)

		if self.inpainting_mask_invert:
		image_mask = ImageOps.invert(image_mask)

+1 −1

Original line number	Diff line number	Diff line
		@@ -598,7 +598,7 @@ def create_ui():

		with gr.TabItem('Inpaint upload', id='inpaint_upload', elem_id="img2img_inpaint_upload_tab") as tab_inpaint_upload:
		init_img_inpaint = gr.Image(label="Image for img2img", show_label=False, source="upload", interactive=True, type="pil", elem_id="img_inpaint_base")
		init_mask_inpaint = gr.Image(label="Mask", source="upload", interactive=True, type="pil", elem_id="img_inpaint_mask")
		init_mask_inpaint = gr.Image(label="Mask", source="upload", interactive=True, type="pil", image_mode="RGBA", elem_id="img_inpaint_mask")

		with gr.TabItem('Batch', id='batch', elem_id="img2img_batch_tab") as tab_batch:
		hidden = '<br>Disabled when launched with --hide-ui-dir-config.' if shared.cmd_opts.hide_ui_dir_config else ''