diff options
author | Alexander Gavrilov <angavrilov@gmail.com> | 2019-04-20 14:15:30 +0300 |
---|---|---|
committer | Alexander Gavrilov <angavrilov@gmail.com> | 2019-04-20 14:59:52 +0300 |
commit | f22397206f4d20ffbc862c02b025c572be900866 (patch) | |
tree | c38587dd320f5a496c0b63a3b13aa519021c9473 /source/blender | |
parent | 7cbb8f20a4b479380dac1d2a2f7c7f85ede408be (diff) |
NLA: check that properties are animatable.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 10 |
1 files changed, 8 insertions, 2 deletions
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; } |