fix

hlky · hlky · commit 0eb3eb8ad1eb · 2024-12-17T14:12:18.000Z
diff --git a/src/diffusers/pipelines/flux/pipeline_flux.py b/src/diffusers/pipelines/flux/pipeline_flux.py
@@ -829,7 +829,7 @@ def __call__(
         lora_scale = (
             self.joint_attention_kwargs.get("scale", None) if self.joint_attention_kwargs is not None else None
         )
-        do_true_cfg = true_cfg > 1 and negative_prompt is not None
+        do_true_cfg = true_cfg > 1 or negative_prompt is not None
         (
             prompt_embeds,
             pooled_prompt_embeds,

Original file line number	Diff line number	Diff line change
`@@ -829,7 +829,7 @@ def __call__(`
`829`	`829`	`lora_scale = (`
`830`	`830`	`self.joint_attention_kwargs.get("scale", None) if self.joint_attention_kwargs is not None else None`
`831`	`831`	`)`
`832`		`- do_true_cfg = true_cfg > 1 and negative_prompt is not None`
	`832`	`+ do_true_cfg = true_cfg > 1 or negative_prompt is not None`
`833`	`833`	`(`
`834`	`834`	`prompt_embeds,`
`835`	`835`	`pooled_prompt_embeds,`