From 5bc9ddd98b3664bce2e0e7ebf92f1de62331e7b4 Mon Sep 17 00:00:00 2001
From: Wayde Moss <wbmoss_dev@yahoo.com>
Date: Fri, 5 Feb 2021 14:18:12 -0500
Subject: Fix T85380: NLA Evaluation Missing Null Check

Introduced by commit: rB40b7929cc040
---
 source/blender/blenkernel/intern/anim_sys.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source/blender/blenkernel/intern')

diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 923a77618aa..19684cbc788 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -1795,6 +1795,11 @@ static void nlasnapshot_from_action(PointerRNA *ptr,
 
     NlaEvalChannel *nec = nlaevalchan_verify(ptr, channels, fcu->rna_path);
 
+    /* Invalid path or property cannot be animated. */
+    if (nec == NULL) {
+      continue;
+    }
+
     NlaEvalChannelSnapshot *necs = nlaeval_snapshot_ensure_channel(r_snapshot, nec);
     if (!nlaevalchan_validate_index_ex(nec, fcu->array_index)) {
       continue;
-- 
cgit v1.2.3