Merge branch 'comfyanonymous:master' into chroma-support

This commit is contained in:
Silver 2025-04-08 19:14:11 +02:00 committed by GitHub
commit caa52b9721
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -786,6 +786,8 @@ class ControlNetLoader:
def load_controlnet(self, control_net_name):
controlnet_path = folder_paths.get_full_path_or_raise("controlnet", control_net_name)
controlnet = comfy.controlnet.load_controlnet(controlnet_path)
if controlnet is None:
raise RuntimeError("ERROR: controlnet file is invalid and does not contain a valid controlnet model.")
return (controlnet,)
class DiffControlNetLoader: