wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-12-18 02:23:06 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

to_strength removed, it is now normalized

Browse Source
This commit is contained in:
FizzleDorf 2023-04-22 03:13:35 -04:00
parent e2b6dd1666
commit a95d6e172b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nodes.py
View File

@ -62,8 +62,8 @@ class ConditioningAverage :
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": {"conditioning_from": ("CONDITIONING", ), "conditioning_to": ("CONDITIONING", ), return {"required": {"conditioning_from": ("CONDITIONING", ), "conditioning_to": ("CONDITIONING", ),
"conditioning_from_strength": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.1}), "conditioning_from_strength": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.1}),
"conditioning_to_strength": ("FLOAT", {"default": 0.0, "min": 0.0, "max": 10.0, "step": 0.1}) #"conditioning_to_strength": ("FLOAT", {"default": 0.0, "min": 0.0, "max": 10.0, "step": 0.1})
}} }}
RETURN_TYPES = ("CONDITIONING",) RETURN_TYPES = ("CONDITIONING",)
FUNCTION = "addWeighted" FUNCTION = "addWeighted"
@ -78,7 +78,8 @@ class ConditioningAverage :
# c.append(n) # c.append(n)
# return (c, ) # return (c, )
def addWeighted(self, conditioning_from, conditioning_to, conditioning_from_strength, conditioning_to_strength): def addWeighted(self, conditioning_from, conditioning_to, conditioning_from_strength):
conditioning_to_strength = (1-conditioning_from_strength)
conditioning_from_tensor = conditioning_from[0][0] conditioning_from_tensor = conditioning_from[0][0]
conditioning_to_tensor = conditioning_to[0][0] conditioning_to_tensor = conditioning_to[0][0]
output = conditioning_from output = conditioning_from