diff options
| author | Kohaku-Blueleaf <59680068+KohakuBlueleaf@users.noreply.github.com> | 2023-08-14 05:34:51 +0000 |
|---|---|---|
| committer | Kohaku-Blueleaf <59680068+KohakuBlueleaf@users.noreply.github.com> | 2023-08-14 05:34:51 +0000 |
| commit | e7c03ccdcefb2a80129703931ef1f8455708945b (patch) | |
| tree | 6769bdb3a32bdf99cf25422206ff03457bdfa86c /modules/processing_scripts | |
| parent | d9cc27cb29926c9cc5dce331da8fbaf996cf4973 (diff) | |
| parent | 007ecfbb29771aa7cdcf0263ab1811bc75fa5446 (diff) | |
| download | stable-diffusion-webui-gfx803-e7c03ccdcefb2a80129703931ef1f8455708945b.tar.gz stable-diffusion-webui-gfx803-e7c03ccdcefb2a80129703931ef1f8455708945b.tar.bz2 stable-diffusion-webui-gfx803-e7c03ccdcefb2a80129703931ef1f8455708945b.zip | |
Merge branch 'dev' into extra-norm-module
Diffstat (limited to 'modules/processing_scripts')
| -rw-r--r-- | modules/processing_scripts/refiner.py | 18 | ||||
| -rw-r--r-- | modules/processing_scripts/seed.py | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/modules/processing_scripts/refiner.py b/modules/processing_scripts/refiner.py index 773ec5d0..3c5b37d2 100644 --- a/modules/processing_scripts/refiner.py +++ b/modules/processing_scripts/refiner.py @@ -38,18 +38,12 @@ class ScriptRefiner(scripts.Script): return enable_refiner, refiner_checkpoint, refiner_switch_at
- def before_process(self, p, enable_refiner, refiner_checkpoint, refiner_switch_at):
+ def setup(self, p, enable_refiner, refiner_checkpoint, refiner_switch_at):
# the actual implementation is in sd_samplers_common.py, apply_refiner
- p.refiner_checkpoint_info = None
- p.refiner_switch_at = None
-
if not enable_refiner or refiner_checkpoint in (None, "", "None"):
- return
-
- refiner_checkpoint_info = sd_models.get_closet_checkpoint_match(refiner_checkpoint)
- if refiner_checkpoint_info is None:
- raise Exception(f'Could not find checkpoint with name {refiner_checkpoint}')
-
- p.refiner_checkpoint_info = refiner_checkpoint_info
- p.refiner_switch_at = refiner_switch_at
+ p.refiner_checkpoint_info = None
+ p.refiner_switch_at = None
+ else:
+ p.refiner_checkpoint = refiner_checkpoint
+ p.refiner_switch_at = refiner_switch_at
diff --git a/modules/processing_scripts/seed.py b/modules/processing_scripts/seed.py index cc90775a..96b44dfb 100644 --- a/modules/processing_scripts/seed.py +++ b/modules/processing_scripts/seed.py @@ -58,7 +58,7 @@ class ScriptSeed(scripts.ScriptBuiltin): return self.seed, subseed, subseed_strength
- def before_process(self, p, seed, subseed, subseed_strength):
+ def setup(self, p, seed, subseed, subseed_strength):
p.seed = seed
if subseed_strength > 0:
|