diff options
| author | Joshua Leung <aligorith@gmail.com> | 2015-03-28 17:03:05 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2015-03-28 17:03:05 +0300 |
| commit | 7a1e7295a5618f271fcdd9d929982d820b772332 (patch) | |
| tree | cd042e12bcfcaf4e481535b4f6c197dbe2798a2a | |
| parent | b253be1a1964e9ce2684a8fa1d3fa487b1513f19 (diff) | |
NLA Strip Keyframes: Nullified the risk that NLA mapping can get applied to NLA Curves
| -rw-r--r-- | source/blender/editors/animation/anim_draw.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index 0e052279796..c0ac42f3a5d 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -173,10 +173,14 @@ AnimData *ANIM_nla_mapping_get(bAnimContext *ac, bAnimListElem *ale) if (G.is_rendering) return NULL; /* handling depends on the type of animation-context we've got */ - if (ale) - return ale->adt; - else - return NULL; + 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... */ + return NULL; } /* ------------------- */ |