diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2021-07-30 12:58:02 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2021-08-12 17:41:49 +0300 |
| commit | 333c3c92ab83c1b18e05a0e765d72f66fc5a5466 (patch) | |
| tree | d0d192b71a3066e9b52de7c155960d1d2b38fefc | |
| parent | dc8844f8ef6a5cfa2be1035162d39e6d83c83d7c (diff) | |
Fix T89805: NLA crash without active track
Was reported for a file which does not have an active track set in
AnimData even though it was in strip twek mode (but this was accessed in
is_nlatrack_evaluatable()).
Root cause for this is not totally clear, but I assume the situation is
described as part T87681 (and is fixed in D11052).
This patch here just prevents the crash for files that are already in the
borked state.
Reviewers: sybren
Maniphest Tasks: T89805
Differential Revision: https://developer.blender.org/D12085
| -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 10a865880f2..92b0db5b214 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -2671,7 +2671,7 @@ static void animsys_create_action_track_strip(const AnimData *adt, static bool is_nlatrack_evaluatable(const AnimData *adt, const NlaTrack *nlt) { /* Skip disabled tracks unless it contains the tweaked strip. */ - const bool contains_tweak_strip = (adt->flag & ADT_NLA_EDIT_ON) && + const bool contains_tweak_strip = (adt->flag & ADT_NLA_EDIT_ON) && adt->act_track && (nlt->index == adt->act_track->index); if ((nlt->flag & NLATRACK_DISABLED) && !contains_tweak_strip) { return false; |