Merge branch 'master' into beta

jn-jairo · Nov 8, 2023 · d18e6f7 · d18e6f7
2 parents d47357f + 794dd20
commit d18e6f7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/comfy/ldm/modules/diffusionmodules/openaimodel.py b/comfy/ldm/modules/diffusionmodules/openaimodel.py
@@ -633,7 +633,7 @@ def forward(self, x, timesteps=None, context=None, y=None, control=None, transfo
         for id, module in enumerate(self.output_blocks):
             transformer_options["block"] = ("output", id)
             hsp = hs.pop()
-            h = apply_control(h, control, 'output')
+            hsp = apply_control(hsp, control, 'output')
 
             if "output_block_patch" in transformer_patches:
                 patch = transformer_patches["output_block_patch"]