Mirrors
/
stable-diffusion-webui
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
AUTOMATIC 2022-09-15 22:31:18 +03:00
parent 6991f2cb27 2ddaeb318a
commit 6452fa2fb7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/scripts.py
View File

@ -92,6 +92,7 @@ class ScriptRunner:
for script in self.scripts: for script in self.scripts:
script.args_from = len(inputs) script.args_from = len(inputs)
script.args_to = len(inputs)
controls = wrap_call(script.ui, script.filename, "ui", is_img2img) controls = wrap_call(script.ui, script.filename, "ui", is_img2img)

2
scripts/prompts_from_file.py
View File

@ -33,7 +33,7 @@ class Script(scripts.Script):
images = [] images = []
for batch_no in range(batch_count): for batch_no in range(batch_count):
state.job = f"{batch_no} out of {batch_count * p.n_iter}" state.job = f"{batch_no + 1} out of {batch_count * p.n_iter}"
p.prompt = lines[batch_no*p.batch_size:(batch_no+1)*p.batch_size] * p.n_iter p.prompt = lines[batch_no*p.batch_size:(batch_no+1)*p.batch_size] * p.n_iter
proc = process_images(p) proc = process_images(p)
images += proc.images images += proc.images