Commit 6452fa2f authored by AUTOMATIC's avatar AUTOMATIC

Merge remote-tracking branch 'origin/master'

parents 6991f2cb 2ddaeb31
...@@ -92,6 +92,7 @@ class ScriptRunner: ...@@ -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)
......
...@@ -33,7 +33,7 @@ class Script(scripts.Script): ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment