[Bf-blender-cvs] [f22397206f4] master: NLA: check that properties are animatable.
Alexander Gavrilov
noreply at git.blender.org
Sat Apr 20 14:07:31 CEST 2019
Commit: f22397206f4d20ffbc862c02b025c572be900866
Author: Alexander Gavrilov
Date: Sat Apr 20 14:15:30 2019 +0300
Branches: master
https://developer.blender.org/rBf22397206f4d20ffbc862c02b025c572be900866
NLA: check that properties are animatable.
===================================================================
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 785c3eedcfc..b4b699f998a 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -2541,6 +2541,9 @@ static NlaEvalChannel *nlaevalchan_verify(PointerRNA *ptr, NlaEvalData *nlaeval,
return *p_path_nec;
}
+ /* Cache NULL result for now. */
+ *p_path_nec = NULL;
+
/* Resolve the property and look it up in the key hash. */
NlaEvalChannelKey key;
@@ -2553,8 +2556,11 @@ static NlaEvalChannel *nlaevalchan_verify(PointerRNA *ptr, NlaEvalData *nlaeval,
path);
}
- /* Cache NULL result. */
- *p_path_nec = NULL;
+ return NULL;
+ }
+
+ /* Check that the property can be animated. */
+ if (ptr->id.data != NULL && !RNA_property_animateable(&key.ptr, key.prop)) {
return NULL;
}
More information about the Bf-blender-cvs
mailing list