post release jumbo update

This commit is contained in:
Vladimir Mandic
2024-02-08 12:10:32 -05:00
parent 8d8815dc47
commit d5a4f43f43
21 changed files with 405 additions and 365 deletions
+6 -3
View File
@@ -113,10 +113,13 @@ def process_diffusers(p: processing.StableDiffusionProcessing):
}
elif (sd_models.get_diffusers_task(model) == sd_models.DiffusersTaskType.INPAINTING or is_img2img_model) and len(getattr(p, 'init_images' ,[])) > 0:
p.ops.append('inpaint')
if p.task_args.get('mask_image', None) is not None: # provided as override by a module
if p.task_args.get('mask_image', None) is not None: # provided as override by a control module
p.mask = masking.run_mask(input_image=p.init_images, input_mask=p.task_args['mask_image'], return_type='Grayscale', invert=p.inpainting_mask_invert==1)
elif getattr(p, 'image_mask', None) is not None: # standard
p.mask = masking.run_mask(input_image=p.init_images, input_mask=p.image_mask, return_type='Grayscale', invert=p.inpainting_mask_invert==1)
elif getattr(p, 'image_mask', None) is not None: # standard img2img
if 'control' in p.ops:
p.mask = masking.run_mask(input_image=p.init_images, input_mask=p.image_mask, return_type='Grayscale', invert=p.inpainting_mask_invert==1) # blur/padding are handled in masking module
else:
p.mask = masking.run_mask(input_image=p.init_images, input_mask=p.image_mask, return_type='Grayscale', invert=p.inpainting_mask_invert==1, mask_blur=p.mask_blur, mask_padding=p.inpaint_full_res_padding) # old img2img
elif getattr(p, 'mask', None) is not None: # backward compatibility
pass
else: # fallback