Update controlnet.py

This commit is contained in:
lllyasviel
2024-01-29 17:08:58 -08:00
parent fe2c1b8279
commit a9827b4de0

View File

@@ -456,8 +456,17 @@ class ControlNetForForgeOfficial(scripts.Script):
params.preprocessor = preprocessor
model_filename = global_state.get_controlnet_filename(unit.model)
params.model = cached_controlnet_loader(model_filename)
controlnet_model = cached_controlnet_loader(model_filename)
controlnet_model.strength = float(unit.weight)
controlnet_model.start_percent = float(unit.guidance_start)
controlnet_model.end_percent = float(unit.guidance_end)
controlnet_model.positive_advanced_weighting = None
controlnet_model.negative_advanced_weighting = None
controlnet_model.advanced_frame_weighting = None
controlnet_model.advanced_sigma_weighting = None
params.model = controlnet_model
logger.info(f"Current ControlNet: {model_filename}")
return
@@ -475,14 +484,6 @@ class ControlNetForForgeOfficial(scripts.Script):
kwargs.update(dict(unit=unit, params=params))
params.model.strength = float(unit.weight)
params.model.start_percent = float(unit.guidance_start)
params.model.end_percent = float(unit.guidance_end)
params.model.positive_advanced_weighting = None
params.model.negative_advanced_weighting = None
params.model.advanced_frame_weighting = None
params.model.advanced_sigma_weighting = None
params.preprocessor.process_before_every_sampling(process=p, cond=cond, **kwargs)
params.model.process_before_every_sampling(process=p, cond=cond, **kwargs)