From abfb9dbf593d1f781d321e387701a8ac0c2fe423 Mon Sep 17 00:00:00 2001 From: Wayde Moss Date: Fri, 5 Feb 2021 17:47:56 -0500 Subject: Fix: Disabled NLA Interferes with Action Eval Introduced by my commit: rB09709a7e64ff This bug effectively enabled the NLA when it should be disabled, when all tracks muted or no strips exist. Specifically, the NLA Action Track settings would be used (extrapolation, blendmode, influence). --- source/blender/blenkernel/intern/anim_sys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/anim_sys.c') diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index da4c43e12a4..aef5fad269f 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -2223,7 +2223,7 @@ static bool is_action_track_evaluated_without_nla(const AnimData *adt, } /** NLA settings interference. */ - if ((adt->flag & (ADT_NLA_SOLO_TRACK | ADT_NLA_EDIT_ON)) == 0) { + if ((adt->flag & (ADT_NLA_SOLO_TRACK | ADT_NLA_EDIT_ON)) != 0) { return false; } -- cgit v1.2.3