Merge branch 'comfyanonymous:master' into master

This commit is contained in:
patientx 2025-02-07 01:22:02 +03:00 committed by GitHub
commit 1e9f6dfa8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1064,7 +1064,8 @@ class StyleModelApply:
for t in conditioning:
(txt, keys) = t
keys = keys.copy()
if strength_type == "attn_bias" and strength != 1.0:
# even if the strength is 1.0 (i.e, no change), if there's already a mask, we have to add to it
if strength_type == "attn_bias" and strength != 1.0 and "attention_mask" not in keys:
# math.log raises an error if the argument is zero
# torch.log returns -inf, which is what we want
attn_bias = torch.log(torch.Tensor([strength]))