Skip to content

GitLab

Commit eed30428 authored by comfyanonymous's avatar comfyanonymous
Browse files

Move conditioning concat node to conditioning section.

parent 8a577966
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
nodes.py
View file @ eed30428
...@@ -113,7 +113,7 @@ class ConditioningConcat: ...@@ -113,7 +113,7 @@ class ConditioningConcat:
RETURN_TYPES = ("CONDITIONING",) RETURN_TYPES = ("CONDITIONING",)
FUNCTION = "concat" FUNCTION = "concat"
CATEGORY = "advanced/conditioning" CATEGORY = "conditioning"
def concat(self, conditioning_to, conditioning_from): def concat(self, conditioning_to, conditioning_from):
out = [] out = []
...@@ -1408,6 +1408,7 @@ NODE_CLASS_MAPPINGS = { ...@@ -1408,6 +1408,7 @@ NODE_CLASS_MAPPINGS = {
"ImagePadForOutpaint": ImagePadForOutpaint, "ImagePadForOutpaint": ImagePadForOutpaint,
"ConditioningAverage ": ConditioningAverage , "ConditioningAverage ": ConditioningAverage ,
"ConditioningCombine": ConditioningCombine, "ConditioningCombine": ConditioningCombine,
"ConditioningConcat": ConditioningConcat,
"ConditioningSetArea": ConditioningSetArea, "ConditioningSetArea": ConditioningSetArea,
"ConditioningSetMask": ConditioningSetMask, "ConditioningSetMask": ConditioningSetMask,
"KSamplerAdvanced": KSamplerAdvanced, "KSamplerAdvanced": KSamplerAdvanced,
...@@ -1441,7 +1442,6 @@ NODE_CLASS_MAPPINGS = { ...@@ -1441,7 +1442,6 @@ NODE_CLASS_MAPPINGS = {
"SaveLatent": SaveLatent, "SaveLatent": SaveLatent,
"ConditioningZeroOut": ConditioningZeroOut, "ConditioningZeroOut": ConditioningZeroOut,
"ConditioningConcat": ConditioningConcat,
} }
NODE_DISPLAY_NAME_MAPPINGS = { NODE_DISPLAY_NAME_MAPPINGS = {
...@@ -1466,6 +1466,7 @@ NODE_DISPLAY_NAME_MAPPINGS = { ...@@ -1466,6 +1466,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
"CLIPSetLastLayer": "CLIP Set Last Layer", "CLIPSetLastLayer": "CLIP Set Last Layer",
"ConditioningCombine": "Conditioning (Combine)", "ConditioningCombine": "Conditioning (Combine)",
"ConditioningAverage ": "Conditioning (Average)", "ConditioningAverage ": "Conditioning (Average)",
"ConditioningConcat": "Conditioning (Concat)",
"ConditioningSetArea": "Conditioning (Set Area)", "ConditioningSetArea": "Conditioning (Set Area)",
"ConditioningSetMask": "Conditioning (Set Mask)", "ConditioningSetMask": "Conditioning (Set Mask)",
"ControlNetApply": "Apply ControlNet", "ControlNetApply": "Apply ControlNet",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment