diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2022-10-02 14:03:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 14:03:01 +0000 |
| commit | a9d7eb722f9034d1d2203dada6d79651ad3edeec (patch) | |
| tree | f622f9f86b77a46f673a08084d4a10db59aeff40 /scripts/xy_grid.py | |
| parent | f28ce3e3a17ccd9b4a03317031a4e3caa1a3088f (diff) | |
| parent | 4e72a1aab6d1b3a8d8c09fadc81843a07c05cc18 (diff) | |
| download | stable-diffusion-webui-gfx803-a9d7eb722f9034d1d2203dada6d79651ad3edeec.tar.gz stable-diffusion-webui-gfx803-a9d7eb722f9034d1d2203dada6d79651ad3edeec.tar.bz2 stable-diffusion-webui-gfx803-a9d7eb722f9034d1d2203dada6d79651ad3edeec.zip | |
Merge branch 'master' into saving
Diffstat (limited to 'scripts/xy_grid.py')
| -rw-r--r-- | scripts/xy_grid.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py index 24fa5a0a..146663b0 100644 --- a/scripts/xy_grid.py +++ b/scripts/xy_grid.py @@ -45,11 +45,8 @@ def apply_sampler(p, x, xs): def apply_checkpoint(p, x, xs):
- applicable = [info for info in modules.sd_models.checkpoints_list.values() if x in info.title]
- assert len(applicable) > 0, f'Checkpoint {x} for found'
-
- info = applicable[0]
-
+ info = modules.sd_models.get_closet_checkpoint_match(x)
+ assert info is not None, f'Checkpoint for {x} not found'
modules.sd_models.reload_model_weights(shared.sd_model, info)
@@ -159,6 +156,9 @@ class Script(scripts.Script): p.batch_size = 1
def process_axis(opt, vals):
+ if opt.label == 'Nothing':
+ return [0]
+
valslist = [x.strip() for x in vals.split(",")]
if opt.type == int:
|