Merge branch 'dev' into master

1 files changed, 5 insertions, 5 deletions

diff --git a/scripts/sd_upscale.py b/scripts/sd_upscale.py
index 332d76d9..e614c23b 100644
--- a/scripts/sd_upscale.py
+++ b/scripts/sd_upscale.py
@@ -4,9 +4,9 @@ import modules.scripts as scripts
 import gradio as gr

 from PIL import Image

 

-from modules import processing, shared, sd_samplers, images, devices

+from modules import processing, shared, images, devices

 from modules.processing import Processed

-from modules.shared import opts, cmd_opts, state

+from modules.shared import opts, state

 

 

 class Script(scripts.Script):

@@ -16,7 +16,7 @@ class Script(scripts.Script):
     def show(self, is_img2img):

         return is_img2img

 

-    def ui(self, is_img2img):        

+    def ui(self, is_img2img):

         info = gr.HTML("<p style=\"margin-bottom:0.75em\">Will upscale the image by the selected scale factor; use width and height sliders to set tile size</p>")

         overlap = gr.Slider(minimum=0, maximum=256, step=16, label='Tile overlap', value=64, elem_id=self.elem_id("overlap"))

         scale_factor = gr.Slider(minimum=1.0, maximum=4.0, step=0.05, label='Scale Factor', value=2.0, elem_id=self.elem_id("scale_factor"))

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

         work = []

 

-        for y, h, row in grid.tiles:

+        for _y, _h, row in grid.tiles:

             for tiledata in row:

                 work.append(tiledata[2])

 

@@ -85,7 +85,7 @@ class Script(scripts.Script):
                 work_results += processed.images

 

             image_index = 0

-            for y, h, row in grid.tiles:

+            for _y, _h, row in grid.tiles:

                 for tiledata in row:

                     tiledata[2] = work_results[image_index] if image_index < len(work_results) else Image.new("RGB", (p.width, p.height))

                     image_index += 1