Skip to content

Commit

Permalink
Merge pull request #15142 from catboxanon/fix/emphasis-prompt-txt-wri…
Browse files Browse the repository at this point in the history
…te-order

Fix emphasis infotext missing from `params.txt`
  • Loading branch information
AUTOMATIC1111 authored Mar 6, 2024
2 parents c1deec6 + ed386c8 commit 11ef1a9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions modules/processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,10 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
if p.scripts is not None:
p.scripts.process_batch(p, batch_number=n, prompts=p.prompts, seeds=p.seeds, subseeds=p.subseeds)

p.setup_conds()

p.extra_generation_params.update(model_hijack.extra_generation_params)

# params.txt should be saved after scripts.process_batch, since the
# infotext could be modified by that callback
# Example: a wildcard processed by process_batch sets an extra model
Expand All @@ -905,13 +909,9 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
processed = Processed(p, [])
file.write(processed.infotext(p, 0))

p.setup_conds()

for comment in model_hijack.comments:
p.comment(comment)

p.extra_generation_params.update(model_hijack.extra_generation_params)

if p.n_iter > 1:
shared.state.job = f"Batch {n+1} out of {p.n_iter}"

Expand Down

0 comments on commit 11ef1a9

Please sign in to comment.