diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-13 00:20:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-13 00:20:09 +0300 |
| commit | b39be6007576021fb377343cd880bfcc44b77031 (patch) | |
| tree | 90ef38312c85bb513413b41484db98030de07e33 /source/blender/editors/include | |
| parent | 63e80e271dd3f9f79fe3a85c10253ee6eea2ba4e (diff) | |
NLA: fix keyframes getting messed up when making strips longer. For drawing
and other operations the nla mapping would be applied to the curves, but not
restored correctly. The unmap function was not the inverse of the map function,
and it's not clear to me it's even possible to make it so due to repeat, so
now the old coordinates are backed up in a list and then restored afterwards.
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_keyframes_edit.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 531751a609e..6d81131492a 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -453,7 +453,7 @@ void getcolor_fcurve_rainbow(int cur, int tot, float *out); struct AnimData *ANIM_nla_mapping_get(bAnimContext *ac, bAnimListElem *ale); /* Apply/Unapply NLA mapping to all keyframes in the nominated F-Curve */ -void ANIM_nla_mapping_apply_fcurve(struct AnimData *adt, struct FCurve *fcu, short restore, short only_keys); +void ANIM_nla_mapping_apply_fcurve(struct AnimData *adt, struct FCurve *fcu, short restore, short only_keys, ListBase *backup); /* ..... */ diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h index 9e29d747d4a..d567398209f 100644 --- a/source/blender/editors/include/ED_keyframes_edit.h +++ b/source/blender/editors/include/ED_keyframes_edit.h @@ -94,6 +94,7 @@ typedef struct BeztEditData { ListBase list; /* temp list for storing custom list of data to check */ struct Scene *scene; /* pointer to current scene - many tools need access to cfra/etc. */ void *data; /* pointer to custom data - usually 'Object' but also 'rectf', but could be other types too */ + void *data2; /* pointer to more custom data */ float f1, f2; /* storage of times/values as 'decimals' */ int i1, i2; /* storage of times/values/flags as 'whole' numbers */ } BeztEditData; |