aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/prompts_from_file.py
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2022-12-03 07:19:51 +0000
committerGitHub <noreply@github.com>2022-12-03 07:19:51 +0000
commitc9a2cfdf2a53d37c2de1908423e4f548088667ef (patch)
treeeabdca1b7665e0ee00f130e9f8544ffd23e474a2 /scripts/prompts_from_file.py
parent39541d7725bc42f456a604b07c50aba503a5a09a (diff)
parent5cd5a672f7889dcc018c3873ec557d645ebe35d0 (diff)
downloadstable-diffusion-webui-gfx803-c9a2cfdf2a53d37c2de1908423e4f548088667ef.tar.gz
stable-diffusion-webui-gfx803-c9a2cfdf2a53d37c2de1908423e4f548088667ef.tar.bz2
stable-diffusion-webui-gfx803-c9a2cfdf2a53d37c2de1908423e4f548088667ef.zip
Merge branch 'master' into racecond_fix
Diffstat (limited to 'scripts/prompts_from_file.py')
-rw-r--r--scripts/prompts_from_file.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py
index 3388bc77..32fe6bdb 100644
--- a/scripts/prompts_from_file.py
+++ b/scripts/prompts_from_file.py
@@ -145,6 +145,8 @@ class Script(scripts.Script):
state.job_count = job_count
images = []
+ all_prompts = []
+ infotexts = []
for n, args in enumerate(jobs):
state.job = f"{state.job_no + 1} out of {state.job_count}"
@@ -157,5 +159,7 @@ class Script(scripts.Script):
if checkbox_iterate:
p.seed = p.seed + (p.batch_size * p.n_iter)
+ all_prompts += proc.all_prompts
+ infotexts += proc.infotexts
- return Processed(p, images, p.seed, "")
+ return Processed(p, images, p.seed, "", all_prompts=all_prompts, infotexts=infotexts)