diff options
| author | Wayde Moss <wbmoss_dev@yahoo.com> | 2021-02-06 01:47:56 +0300 |
|---|---|---|
| committer | Wayde Moss <wbmoss_dev@yahoo.com> | 2021-02-06 01:47:56 +0300 |
| commit | abfb9dbf593d1f781d321e387701a8ac0c2fe423 (patch) | |
| tree | 86a9704ad1da8b8585c33a63f75e0252b516f822 /source/blender/blenkernel/intern/anim_sys.c | |
| parent | 10e23fd1046a0fd1f2e2f7cac7fc897cc0ea99be (diff) | |
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).
Diffstat (limited to 'source/blender/blenkernel/intern/anim_sys.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |