diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-01-18 03:35:28 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-01-18 03:35:28 +0300 |
| commit | 90e95d896c964bd17b9f46e5f41bcb3ba47618c4 (patch) | |
| tree | e43558e814f1aeac2a2c5b1a730a121172dd1c0a /source/blender/editors/animation/keyframes_draw.c | |
| parent | 280df5dd470b02c40eb7254efcfea0d617a76075 (diff) | |
NLA (Un)Mapping Fixes:
Hopefully this time I've finally found the proper fix for this. At least in the mini test-suite I made for this, the new inverse process seemed stable enough.
---
Also, tweaked the keyframe drawing code so that it doesn't convert the handles too when performing NLA mapping. This should provide some minor speed boosts when drawing keyframes under these conditions...
Diffstat (limited to 'source/blender/editors/animation/keyframes_draw.c')
| -rw-r--r-- | source/blender/editors/animation/keyframes_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index 3a48aa0b063..da1233c17f1 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -855,7 +855,7 @@ void fcurve_to_keylist(AnimData *adt, FCurve *fcu, DLRBT_Tree *keys, DLRBT_Tree if (fcu && fcu->totvert && fcu->bezt) { /* apply NLA-mapping (if applicable) */ if (adt) - ANIM_nla_mapping_apply_fcurve(adt, fcu, 0, 1); + ANIM_nla_mapping_apply_fcurve(adt, fcu, 0, 0); /* if getting long keyframes too, grab the BezTriples in a BST for * accelerated searching... @@ -892,7 +892,7 @@ void fcurve_to_keylist(AnimData *adt, FCurve *fcu, DLRBT_Tree *keys, DLRBT_Tree /* unapply NLA-mapping if applicable */ if (adt) - ANIM_nla_mapping_apply_fcurve(adt, fcu, 1, 1); + ANIM_nla_mapping_apply_fcurve(adt, fcu, 1, 0); } } |