diff options
| author | AUTOMATIC <16777216c@gmail.com> | 2022-10-11 12:00:16 +0000 |
|---|---|---|
| committer | AUTOMATIC <16777216c@gmail.com> | 2022-10-11 12:00:16 +0000 |
| commit | dce7fc902ae2c6d9ffa71db67471abdcda72f82c (patch) | |
| tree | 117d6c031f0e3bac94f9a424b50fdb239c3fd993 /scripts | |
| parent | 530103b586109c11fd068eb70ef09503ec6a4caf (diff) | |
| parent | 1a0a6a84c3149e236211d547471f5416cd1129f3 (diff) | |
| download | stable-diffusion-webui-gfx803-dce7fc902ae2c6d9ffa71db67471abdcda72f82c.tar.gz stable-diffusion-webui-gfx803-dce7fc902ae2c6d9ffa71db67471abdcda72f82c.tar.bz2 stable-diffusion-webui-gfx803-dce7fc902ae2c6d9ffa71db67471abdcda72f82c.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/loopback.py | 4 | ||||
| -rw-r--r-- | scripts/xy_grid.py | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/scripts/loopback.py b/scripts/loopback.py index e90b58d4..d8c68af8 100644 --- a/scripts/loopback.py +++ b/scripts/loopback.py @@ -38,6 +38,7 @@ class Script(scripts.Script): grids = []
all_images = []
+ original_init_image = p.init_images
state.job_count = loops * batch_count
initial_color_corrections = [processing.setup_color_correction(p.init_images[0])]
@@ -45,6 +46,9 @@ class Script(scripts.Script): for n in range(batch_count):
history = []
+ # Reset to original init image at the start of each batch
+ p.init_images = original_init_image
+
for i in range(loops):
p.n_iter = 1
p.batch_size = 1
diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py index 0af5993c..16918c99 100644 --- a/scripts/xy_grid.py +++ b/scripts/xy_grid.py @@ -28,6 +28,9 @@ def apply_field(field): def apply_prompt(p, x, xs):
+ if xs[0] not in p.prompt and xs[0] not in p.negative_prompt:
+ raise RuntimeError(f"Prompt S/R did not find {xs[0]} in prompt or negative prompt.")
+
p.prompt = p.prompt.replace(xs[0], x)
p.negative_prompt = p.negative_prompt.replace(xs[0], x)
|