diff options
| author | Zac Liu <liuguang@baai.ac.cn> | 2022-12-06 01:16:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-06 01:16:15 +0000 |
| commit | 3ebf977a6e4f478ab918e44506974beee32da276 (patch) | |
| tree | f68456207e5cd78718ec1e9c588ecdc22d568d81 /scripts | |
| parent | 231fb72872191ffa8c446af1577c9003b3d19d4f (diff) | |
| parent | 44c46f0ed395967cd3830dd481a2db759fda5b3b (diff) | |
| download | stable-diffusion-webui-gfx803-3ebf977a6e4f478ab918e44506974beee32da276.tar.gz stable-diffusion-webui-gfx803-3ebf977a6e4f478ab918e44506974beee32da276.tar.bz2 stable-diffusion-webui-gfx803-3ebf977a6e4f478ab918e44506974beee32da276.zip | |
Merge branch 'AUTOMATIC1111:master' into master
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/prompt_matrix.py | 2 | ||||
| -rw-r--r-- | scripts/xy_grid.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/prompt_matrix.py b/scripts/prompt_matrix.py index 4d1e152d..5fd952e9 100644 --- a/scripts/prompt_matrix.py +++ b/scripts/prompt_matrix.py @@ -84,6 +84,6 @@ class Script(scripts.Script): processed.infotexts.insert(0, processed.infotexts[0])
if opts.grid_save:
- images.save_image(processed.images[0], p.outpath_grids, "prompt_matrix", prompt=original_prompt, seed=processed.seed, grid=True, p=p)
+ images.save_image(processed.images[0], p.outpath_grids, "prompt_matrix", extension=opts.grid_format, prompt=original_prompt, seed=processed.seed, grid=True, p=p)
return processed
diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py index 0f27deda..d402c281 100644 --- a/scripts/xy_grid.py +++ b/scripts/xy_grid.py @@ -383,6 +383,6 @@ class Script(scripts.Script): )
if opts.grid_save:
- images.save_image(processed.images[0], p.outpath_grids, "xy_grid", prompt=p.prompt, seed=processed.seed, grid=True, p=p)
+ images.save_image(processed.images[0], p.outpath_grids, "xy_grid", extension=opts.grid_format, prompt=p.prompt, seed=processed.seed, grid=True, p=p)
return processed
|