[Bf-blender-cvs] [5bc9ddd98b3] master: Fix T85380: NLA Evaluation Missing Null Check
Wayde Moss
noreply at git.blender.org
Fri Feb 5 20:23:44 CET 2021
Commit: 5bc9ddd98b3664bce2e0e7ebf92f1de62331e7b4
Author: Wayde Moss
Date: Fri Feb 5 14:18:12 2021 -0500
Branches: master
https://developer.blender.org/rB5bc9ddd98b3664bce2e0e7ebf92f1de62331e7b4
Fix T85380: NLA Evaluation Missing Null Check
Introduced by commit: rB40b7929cc040
===================================================================
M 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 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;
More information about the Bf-blender-cvs
mailing list