Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayde Moss <wbmoss_dev@yahoo.com>2021-02-05 22:18:12 +0300
committerWayde Moss <wbmoss_dev@yahoo.com>2021-02-05 22:19:38 +0300
commit5bc9ddd98b3664bce2e0e7ebf92f1de62331e7b4 (patch)
tree059d1f0078213d674a2382c7b779327fffe6689e /source/blender/blenkernel/intern/anim_sys.c
parent7d874b03433d19695f9e4e4bffb297d02c66c6eb (diff)
Fix T85380: NLA Evaluation Missing Null Check
Introduced by commit: rB40b7929cc040
Diffstat (limited to 'source/blender/blenkernel/intern/anim_sys.c')
-rw-r--r--source/blender/blenkernel/intern/anim_sys.c5
1 files changed, 5 insertions, 0 deletions
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;