aboutsummaryrefslogtreecommitdiffstats
path: root/modules/extras.py
diff options
context:
space:
mode:
authormissionfloyd <missionfloyd@users.noreply.github.com>2023-07-12 08:57:57 +0000
committerGitHub <noreply@github.com>2023-07-12 08:57:57 +0000
commite0218c4f22396a1be8aa4fde3db17c6fc85904eb (patch)
tree9cc918c09da3afaa4dfd93a823e5485006b9e5c6 /modules/extras.py
parent3fee3c34f1b01d21770ab0a226b432cdd8444792 (diff)
parent15adff3d6d5e8ba186b3df6eee8a8d774c8f3879 (diff)
downloadstable-diffusion-webui-gfx803-e0218c4f22396a1be8aa4fde3db17c6fc85904eb.tar.gz
stable-diffusion-webui-gfx803-e0218c4f22396a1be8aa4fde3db17c6fc85904eb.tar.bz2
stable-diffusion-webui-gfx803-e0218c4f22396a1be8aa4fde3db17c6fc85904eb.zip
Merge branch 'dev' into img2img-save
Diffstat (limited to 'modules/extras.py')
-rw-r--r--modules/extras.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/extras.py b/modules/extras.py
index 830b53aa..e9c0263e 100644
--- a/modules/extras.py
+++ b/modules/extras.py
@@ -73,8 +73,7 @@ def to_half(tensor, enable):
def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_model_name, interp_method, multiplier, save_as_half, custom_name, checkpoint_format, config_source, bake_in_vae, discard_weights, save_metadata):
- shared.state.begin()
- shared.state.job = 'model-merge'
+ shared.state.begin(job="model-merge")
def fail(message):
shared.state.textinfo = message