Merge branch 'dev' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into tomesd

1 files changed, 3 insertions, 6 deletions

diff --git a/scripts/prompt_matrix.py b/scripts/prompt_matrix.py
index e9b11517..88324fe6 100644
--- a/scripts/prompt_matrix.py
+++ b/scripts/prompt_matrix.py
@@ -1,14 +1,11 @@
 import math

-from collections import namedtuple

-from copy import copy

-import random

 

 import modules.scripts as scripts

 import gradio as gr

 

 from modules import images

-from modules.processing import process_images, Processed

-from modules.shared import opts, cmd_opts, state

+from modules.processing import process_images

+from modules.shared import opts, state

 import modules.sd_samplers

 

 

@@ -99,7 +96,7 @@ class Script(scripts.Script):
         p.prompt_for_display = positive_prompt

         processed = process_images(p)

 

-        grid = images.image_grid(processed.images, p.batch_size, rows=1 << ((len(prompt_matrix_parts) - 1) // 2)) 

+        grid = images.image_grid(processed.images, p.batch_size, rows=1 << ((len(prompt_matrix_parts) - 1) // 2))

         grid = images.draw_prompt_matrix(grid, processed.images[0].width, processed.images[0].height, prompt_matrix_parts, margin_size)

         processed.images.insert(0, grid)

         processed.index_of_first_image = 1