Removed changes in some scripts since the arguments for soft painting are no longer passed through the same path as "mask_blur".

1 files changed, 1 insertions, 49 deletions

diff --git a/modules/img2img.py b/modules/img2img.py
index 3aa8a9ce..c583290a 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -15,7 +15,6 @@ import modules.shared as shared
 import modules.processing as processing

 from modules.ui import plaintext_to_html

 import modules.scripts

-import modules.soft_inpainting as si

 

 

 def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=False, scale_by=1.0, use_png_info=False, png_info_props=None, png_info_dir=None):

@@ -147,48 +146,7 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
     return batch_results

 

 

-def img2img(id_task: str,

-            mode: int,

-            prompt: str,

-            negative_prompt: str,

-            prompt_styles,

-            init_img,

-            sketch,

-            init_img_with_mask,

-            inpaint_color_sketch,

-            inpaint_color_sketch_orig,

-            init_img_inpaint,

-            init_mask_inpaint,

-            steps: int,

-            sampler_name: str,

-            mask_blur: int,

-            mask_alpha: float,

-            mask_blend_enabled: bool,

-            mask_blend_power: float,

-            mask_blend_scale: float,

-            inpaint_detail_preservation: float,

-            inpainting_fill: int,

-            n_iter: int,

-            batch_size: int,

-            cfg_scale: float,

-            image_cfg_scale: float,

-            denoising_strength: float,

-            selected_scale_tab: int,

-            height: int,

-            width: int,

-            scale_by: float,

-            resize_mode: int,

-            inpaint_full_res: bool,

-            inpaint_full_res_padding: int,

-            inpainting_mask_invert: int,

-            img2img_batch_input_dir: str,

-            img2img_batch_output_dir: str,

-            img2img_batch_inpaint_mask_dir: str,

-            override_settings_texts,

-            img2img_batch_use_png_info: bool,

-            img2img_batch_png_info_props: list,

-            img2img_batch_png_info_dir: str,

-            request: gr.Request, *args):

+def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_styles, init_img, sketch, init_img_with_mask, inpaint_color_sketch, inpaint_color_sketch_orig, init_img_inpaint, init_mask_inpaint, steps: int, sampler_name: str, mask_blur: int, mask_alpha: float, inpainting_fill: int, n_iter: int, batch_size: int, cfg_scale: float, image_cfg_scale: float, denoising_strength: float, selected_scale_tab: int, height: int, width: int, scale_by: float, resize_mode: int, inpaint_full_res: bool, inpaint_full_res_padding: int, inpainting_mask_invert: int, img2img_batch_input_dir: str, img2img_batch_output_dir: str, img2img_batch_inpaint_mask_dir: str, override_settings_texts, img2img_batch_use_png_info: bool, img2img_batch_png_info_props: list, img2img_batch_png_info_dir: str, request: gr.Request, *args):

     override_settings = create_override_settings_dict(override_settings_texts)

 

     is_batch = mode == 5

@@ -229,9 +187,6 @@ def img2img(id_task: str,
 

     assert 0. <= denoising_strength <= 1., 'can only work with strength in [0.0, 1.0]'

 

-    soft_inpainting = si.SoftInpaintingSettings(mask_blend_power, mask_blend_scale, inpaint_detail_preservation) \

-        if mask_blend_enabled else None

-

     p = StableDiffusionProcessingImg2Img(

         sd_model=shared.sd_model,

         outpath_samples=opts.outdir_samples or opts.outdir_img2img_samples,

@@ -249,7 +204,6 @@ def img2img(id_task: str,
         init_images=[image],

         mask=mask,

         mask_blur=mask_blur,

-        soft_inpainting=soft_inpainting,

         inpainting_fill=inpainting_fill,

         resize_mode=resize_mode,

         denoising_strength=denoising_strength,

@@ -270,8 +224,6 @@ def img2img(id_task: str,
 

     if mask:

         p.extra_generation_params["Mask blur"] = mask_blur

-        if soft_inpainting is not None:

-            soft_inpainting.add_generation_params(p.extra_generation_params)

 

     with closing(p):

         if is_batch: