diff options
author | d8ahazard <d8ahazard@gmail.com> | 2022-09-30 00:59:36 +0000 |
---|---|---|
committer | d8ahazard <d8ahazard@gmail.com> | 2022-09-30 00:59:36 +0000 |
commit | d73741794d38a5c1aacacc7a6ed3fe3ca65724db (patch) | |
tree | d498141630f535a7ea3d7538707f4213538a332c /scripts/xy_grid.py | |
parent | 0dce0df1ee63b2f158805c1a1f1a3743cc4a104b (diff) | |
parent | 498515e7a19bb3e8ab36aab2e628eb6be7464401 (diff) | |
download | stable-diffusion-webui-gfx803-d73741794d38a5c1aacacc7a6ed3fe3ca65724db.tar.gz stable-diffusion-webui-gfx803-d73741794d38a5c1aacacc7a6ed3fe3ca65724db.tar.bz2 stable-diffusion-webui-gfx803-d73741794d38a5c1aacacc7a6ed3fe3ca65724db.zip |
Merge remote-tracking branch 'upstream/master' into ModelLoader
Diffstat (limited to 'scripts/xy_grid.py')
-rw-r--r-- | scripts/xy_grid.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py index 7c01231f..f8bc64c4 100644 --- a/scripts/xy_grid.py +++ b/scripts/xy_grid.py @@ -87,12 +87,12 @@ axis_options = [ AxisOption("Prompt S/R", str, apply_prompt, format_value),
AxisOption("Sampler", str, apply_sampler, format_value),
AxisOption("Checkpoint name", str, apply_checkpoint, format_value),
- AxisOption("Sigma Churn", float, apply_field("s_churn"), format_value_add_label),
- AxisOption("Sigma min", float, apply_field("s_tmin"), format_value_add_label),
- AxisOption("Sigma max", float, apply_field("s_tmax"), format_value_add_label),
- AxisOption("Sigma noise", float, apply_field("s_noise"), format_value_add_label),
- AxisOption("DDIM Eta", float, apply_field("ddim_eta"), format_value_add_label),
- AxisOptionImg2Img("Denoising", float, apply_field("denoising_strength"), format_value_add_label),# as it is now all AxisOptionImg2Img items must go after AxisOption ones
+ AxisOption("Sigma Churn", float, apply_field("s_churn"), format_value_add_label),
+ AxisOption("Sigma min", float, apply_field("s_tmin"), format_value_add_label),
+ AxisOption("Sigma max", float, apply_field("s_tmax"), format_value_add_label),
+ AxisOption("Sigma noise", float, apply_field("s_noise"), format_value_add_label),
+ AxisOption("Eta", float, apply_field("eta"), format_value_add_label),
+ AxisOptionImg2Img("Denoising", float, apply_field("denoising_strength"), format_value_add_label), # as it is now all AxisOptionImg2Img items must go after AxisOption ones
]
@@ -159,6 +159,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:
|