This commit is contained in:
lllyasviel
2024-01-31 09:46:24 -08:00
parent 8a0dcd09c9
commit 071be046d2
15 changed files with 153 additions and 561 deletions

View File

@@ -66,14 +66,14 @@ def apply_controlnet_advanced(
return m
def compute_controlnet_weighting(
control,
positive_advanced_weighting,
negative_advanced_weighting,
advanced_frame_weighting,
advanced_sigma_weighting,
transformer_options
):
def compute_controlnet_weighting(control, cnet):
positive_advanced_weighting = cnet.positive_advanced_weighting
negative_advanced_weighting = cnet.negative_advanced_weighting
advanced_frame_weighting = cnet.advanced_frame_weighting
advanced_sigma_weighting = cnet.advanced_sigma_weighting
transformer_options = cnet.transformer_options
if positive_advanced_weighting is None and negative_advanced_weighting is None \
and advanced_frame_weighting is None and advanced_sigma_weighting is None:
return control