Fix issue when using multiple t2i adapters with batched images.

1a57423d · comfyanonymous · 2c80d9ac · 1a57423d
Commit 1a57423d authored Jan 10, 2024 by comfyanonymous
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

comfy/controlnet.py comfy/controlnet.py +4 -1

No files found.
--- a/comfy/controlnet.py
+++ b/comfy/controlnet.py
@@ -126,7 +126,10 @@ class ControlBase:
                        if o[i] is None:
                            o[i] = prev_val
                        else:
-                            o[i] += prev_val
+                            if o[i].shape[0] < prev_val.shape[0]:
+                                o[i] = prev_val + o[i]
+                            else:
+                                o[i] += prev_val
        return out

 class ControlNet(ControlBase):