298977887/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-07-15 11:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed 'opt_hooks' input of Cond/Cond Pair Set Default Combine nodes to 'hooks'

Browse Source
This commit is contained in:
Jedrzej Kosinski 2024-12-01 21:40:16 -06:00
parent dff03e5218
commit abebf91604
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
comfy_extras/nodes_hooks.py
View File

@ -183,7 +183,7 @@ class PairConditioningSetDefaultAndCombine:
"negative_DEFAULT": ("CONDITIONING",), "negative_DEFAULT": ("CONDITIONING",),
}, },
"optional": { "optional": {
"opt_hooks": ("HOOKS",), "hooks": ("HOOKS",),
} }
} }
@ -194,9 +194,9 @@ class PairConditioningSetDefaultAndCombine:
FUNCTION = "set_default_and_combine" FUNCTION = "set_default_and_combine"
def set_default_and_combine(self, positive, negative, positive_DEFAULT, negative_DEFAULT, def set_default_and_combine(self, positive, negative, positive_DEFAULT, negative_DEFAULT,
opt_hooks: comfy.hooks.HookGroup=None): hooks: comfy.hooks.HookGroup=None):
final_positive, final_negative = comfy.hooks.set_default_conds_and_combine(conds=[positive, negative], new_conds=[positive_DEFAULT, negative_DEFAULT], final_positive, final_negative = comfy.hooks.set_default_conds_and_combine(conds=[positive, negative], new_conds=[positive_DEFAULT, negative_DEFAULT],
hooks=opt_hooks) hooks=hooks)
return (final_positive, final_negative) return (final_positive, final_negative)
class ConditioningSetDefaultAndCombine: class ConditioningSetDefaultAndCombine:
@ -210,7 +210,7 @@ class ConditioningSetDefaultAndCombine:
"cond_DEFAULT": ("CONDITIONING",), "cond_DEFAULT": ("CONDITIONING",),
}, },
"optional": { "optional": {
"opt_hooks": ("HOOKS",), "hooks": ("HOOKS",),
} }
} }
@ -220,9 +220,9 @@ class ConditioningSetDefaultAndCombine:
FUNCTION = "set_default_and_combine" FUNCTION = "set_default_and_combine"
def set_default_and_combine(self, cond, cond_DEFAULT, def set_default_and_combine(self, cond, cond_DEFAULT,
opt_hooks: comfy.hooks.HookGroup=None): hooks: comfy.hooks.HookGroup=None):
(final_conditioning,) = comfy.hooks.set_default_conds_and_combine(conds=[cond], new_conds=[cond_DEFAULT], (final_conditioning,) = comfy.hooks.set_default_conds_and_combine(conds=[cond], new_conds=[cond_DEFAULT],
hooks=opt_hooks) hooks=hooks)
return (final_conditioning,) return (final_conditioning,)
class SetClipHooks: class SetClipHooks: