aboutsummaryrefslogtreecommitdiff
path: root/modules/extras.py
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2023-07-13 15:21:39 +0300
committerGitHub <noreply@github.com>2023-07-13 15:21:39 +0300
commitb7c5b30f14aadffadd2d35cb3ecb3e91af00581d (patch)
tree0e51f517bb6ac010c0e3dc5937d112656ec9ee9a /modules/extras.py
parent14501f56aaf3c97fb2c38633350dc747b9651f43 (diff)
parent262ec8ecdaf10d8fe49d0227e24bd3a1459e87b5 (diff)
Merge branch 'dev' into master
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