diff options
| author | JC-Array <44535867+JC-Array@users.noreply.github.com> | 2022-10-10 23:06:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-10 23:06:07 +0000 |
| commit | aca1553bde726e1455f3a73a6378b31e93d3e8f2 (patch) | |
| tree | b5492fb630f58deddd9fbf812fdd7d9134a59cc1 /scripts | |
| parent | 45fbd1c5fec887988ab555aac75a999d4f3aff40 (diff) | |
| parent | 42bf5fa3256bff5e4640e5a626e750d4e49e01e1 (diff) | |
| download | stable-diffusion-webui-gfx803-aca1553bde726e1455f3a73a6378b31e93d3e8f2.tar.gz stable-diffusion-webui-gfx803-aca1553bde726e1455f3a73a6378b31e93d3e8f2.tar.bz2 stable-diffusion-webui-gfx803-aca1553bde726e1455f3a73a6378b31e93d3e8f2.zip | |
Merge pull request #1 from AUTOMATIC1111/master
updating files to resolve merge conflicts
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/xy_grid.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py index 771eb8e4..42e1489c 100644 --- a/scripts/xy_grid.py +++ b/scripts/xy_grid.py @@ -205,7 +205,10 @@ class Script(scripts.Script): if not no_fixed_seeds:
modules.processing.fix_seed(p)
- p.batch_size = 1
+ if not opts.return_grid:
+ p.batch_size = 1
+
+
CLIP_stop_at_last_layers = opts.CLIP_stop_at_last_layers
def process_axis(opt, vals):
|