diff --git a/comfy/cldm/control_types.py b/comfy/cldm/control_types.py index fd6e56e8..4128631a 100644 --- a/comfy/cldm/control_types.py +++ b/comfy/cldm/control_types.py @@ -1,5 +1,4 @@ UNION_CONTROLNET_TYPES = { - "auto": -1, "openpose": 0, "depth": 1, "hed/pidi/scribble/ted": 2, diff --git a/comfy_extras/nodes_controlnet.py b/comfy_extras/nodes_controlnet.py index 566d51e3..0773c8a5 100644 --- a/comfy_extras/nodes_controlnet.py +++ b/comfy_extras/nodes_controlnet.py @@ -4,7 +4,7 @@ class SetUnionControlNetType: @classmethod def INPUT_TYPES(s): return {"required": {"control_net": ("CONTROL_NET", ), - "type": (list(UNION_CONTROLNET_TYPES.keys()),) + "type": (["auto"] + list(UNION_CONTROLNET_TYPES.keys()),) }} CATEGORY = "conditioning/controlnet" @@ -14,7 +14,7 @@ class SetUnionControlNetType: def set_controlnet_type(self, control_net, type): control_net = control_net.copy() - type_number = UNION_CONTROLNET_TYPES[type] + type_number = UNION_CONTROLNET_TYPES.get(type, -1) if type_number >= 0: control_net.set_extra_arg("control_type", [type_number]) else: