Merge branch 'dev' into improve-frontend-responsiveness

1 files changed, 4 insertions, 4 deletions

diff --git a/scripts/outpainting_mk_2.py b/scripts/outpainting_mk_2.py
index 0906da6a..665dbe89 100644
--- a/scripts/outpainting_mk_2.py
+++ b/scripts/outpainting_mk_2.py
@@ -7,9 +7,9 @@ import modules.scripts as scripts
 import gradio as gr

 from PIL import Image, ImageDraw

 

-from modules import images, processing, devices

+from modules import images

 from modules.processing import Processed, process_images

-from modules.shared import opts, cmd_opts, state

+from modules.shared import opts, state

 

 

 # this function is taken from https://github.com/parlance-zz/g-diffuser-bot

@@ -72,7 +72,7 @@ def get_matched_noise(_np_src_image, np_mask_rgb, noise_q=1, color_variation=0.0
     height = _np_src_image.shape[1]

     num_channels = _np_src_image.shape[2]

 

-    np_src_image = _np_src_image[:] * (1. - np_mask_rgb)

+    _np_src_image[:] * (1. - np_mask_rgb)

     np_mask_grey = (np.sum(np_mask_rgb, axis=2) / 3.)

     img_mask = np_mask_grey > 1e-6

     ref_mask = np_mask_grey < 1e-3

@@ -275,7 +275,7 @@ class Script(scripts.Script):
 

         if opts.samples_save:

             for img in all_processed_images:

-                images.save_image(img, p.outpath_samples, "", res.seed, p.prompt, opts.grid_format, info=res.info, p=p)

+                images.save_image(img, p.outpath_samples, "", res.seed, p.prompt, opts.samples_format, info=res.info, p=p)

 

         if opts.grid_save and not unwanted_grid_because_of_img_count:

             images.save_image(combined_grid_image, p.outpath_grids, "grid", res.seed, p.prompt, opts.grid_format, info=res.info, short_filename=not opts.grid_extended_filename, grid=True, p=p)