[Bf-blender-cvs] [7a1e729] master: NLA Strip Keyframes: Nullified the risk that NLA mapping can get applied to NLA Curves
Joshua Leung
noreply at git.blender.org
Sat Mar 28 15:08:17 CET 2015
Commit: 7a1e7295a5618f271fcdd9d929982d820b772332
Author: Joshua Leung
Date: Sun Mar 29 03:03:05 2015 +1300
Branches: master
https://developer.blender.org/rB7a1e7295a5618f271fcdd9d929982d820b772332
NLA Strip Keyframes: Nullified the risk that NLA mapping can get applied to NLA Curves
===================================================================
M source/blender/editors/animation/anim_draw.c
===================================================================
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c
index 0e05227..c0ac42f 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;
}
/* ------------------- */
More information about the Bf-blender-cvs
mailing list