From 68e7f4ec53a6540ede43602469b441eaecbb1f44 Mon Sep 17 00:00:00 2001
From: Bryan Lyon <bryanlyon@users.noreply.github.com>
Date: Wed, 8 Feb 2023 09:32:25 -0800
Subject: [PATCH] Added a scalable version of ConditioningCombine called
 ConditioningCombineWeighted

---
 nodes.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/nodes.py b/nodes.py
index eea66b45f..96df47718 100644
--- a/nodes.py
+++ b/nodes.py
@@ -40,6 +40,23 @@ class CLIPTextEncode:
     def encode(self, clip, text):
         return ([[clip.encode(text), {}]], )
 
+class ConditioningCombineWeighted:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": {"conditioning_1": ("CONDITIONING", ), "conditioning_2": ("CONDITIONING", ),
+                              "conditioning_1_strength": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.1}),
+                              "conditioning_2_strength": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.1})
+                             }}
+    RETURN_TYPES = ("CONDITIONING",)
+    FUNCTION = "combineWeighted"
+
+    CATEGORY = "conditioning"
+
+    def combineWeighted(self, conditioning_1, conditioning_2, conditioning_1_strength, conditioning_2_strength):
+        output = conditioning_1
+        output[0][0] = (conditioning_1[0][0] * conditioning_1_strength + conditioning_2[0][0] * conditioning_2_strength)/(conditioning_1_strength + conditioning_2_strength)
+        return (output, )
+
 class ConditioningCombine:
     @classmethod
     def INPUT_TYPES(s):
@@ -561,6 +578,7 @@ NODE_CLASS_MAPPINGS = {
     "LoadImage": LoadImage,
     "ImageScale": ImageScale,
     "ConditioningCombine": ConditioningCombine,
+    "ConditioningCombineWeighted": ConditioningCombineWeighted,
     "ConditioningSetArea": ConditioningSetArea,
     "KSamplerAdvanced": KSamplerAdvanced,
     "LatentComposite": LatentComposite,