blender
/
blender
135
403
Fork 586
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Fix: NLA Mapping should not apply to keyframes of Driver FCUrves

This commit is contained in:
Joshua Leung 2015-12-15 01:53:13 +13:00
parent de0119d087
commit 236d094865
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/animation/anim_draw.c
View File

@ -181,11 +181,17 @@ AnimData *ANIM_nla_mapping_get(bAnimContext *ac, bAnimListElem *ale)
/* abort if rendering - we may get some race condition issues... */
if (G.is_rendering) return NULL;
/* handling depends on the type of animation-context we've got */
if (ale) {
/* NLA Control Curves occur on NLA strips, and shouldn't be subjected to this kind of mapping */
if (ale->type != ANIMTYPE_NLACURVE)
return ale->adt;
/* apart from strictly keyframe-related contexts, this shouldn't even happen */
// XXX: nla and channel here may not be necessary...
if (ELEM(ac->datatype, ANIMCONT_ACTION, ANIMCONT_SHAPEKEY, ANIMCONT_DOPESHEET,
ANIMCONT_FCURVES, ANIMCONT_NLA, ANIMCONT_CHANNEL))
{
/* handling depends on the type of animation-context we've got */
if (ale) {
/* NLA Control Curves occur on NLA strips, and shouldn't be subjected to this kind of mapping */
if (ale->type != ANIMTYPE_NLACURVE)
return ale->adt;
}
}
/* cannot handle... */