From 4b320c26a3918b9aca83dda850195c55d8b7eefd Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Sat, 3 Jan 2009 06:01:11 +0000 Subject: 2.5 - Action Editor: IPO Curve Protect works now * Added the relevant filtering necessary for this to work, into the animation-channel filtering code. * Updated most of the keyframe-editing tools to respect this * Renamed keyframe-editing API loopers (added ANIM_ prefix) for consistency * Added function for mapping keyframes to/from NLA-mapping for Ipo-Curves in addition to the one for IPO blocks. As a result, renamed the latter for consistency. --- source/blender/editors/include/ED_keyframes_edit.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/include/ED_keyframes_edit.h') diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h index 75faaf85d14..eb6f422e425 100644 --- a/source/blender/editors/include/ED_keyframes_edit.h +++ b/source/blender/editors/include/ED_keyframes_edit.h @@ -87,13 +87,12 @@ typedef enum eEditKeyframes_Mirror { /* --- Generic Properties for Bezier Edit Tools ----- */ -// XXX maybe a union would be more compact? 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 - not that useful? */ + void *data; /* pointer to custom data - usually 'Object', but could be other types too */ float f1, f2; /* storage of times/values as 'decimals' */ - int i1, i2; /* storage of times/values as 'whole' numbers */ + int i1, i2; /* storage of times/values/flags as 'whole' numbers */ } BeztEditData; /* ------- Function Pointer Typedefs ---------------- */ @@ -106,8 +105,8 @@ typedef short (*BeztEditFunc)(BeztEditData *bed, struct BezTriple *bezt); /* ---------------- Looping API --------------------- */ /* functions for looping over keyframes */ -short icu_keys_bezier_loop(BeztEditData *bed, struct IpoCurve *icu, BeztEditFunc bezt_ok, BeztEditFunc bezt_cb, IcuEditFunc icu_cb); -short ipo_keys_bezier_loop(BeztEditData *bed, struct Ipo *ipo, BeztEditFunc bezt_ok, BeztEditFunc bezt_cb, IcuEditFunc icu_cb); +short ANIM_icu_keys_bezier_loop(BeztEditData *bed, struct IpoCurve *icu, BeztEditFunc bezt_ok, BeztEditFunc bezt_cb, IcuEditFunc icu_cb); +short ANIM_ipo_keys_bezier_loop(BeztEditData *bed, struct Ipo *ipo, BeztEditFunc bezt_ok, BeztEditFunc bezt_cb, IcuEditFunc icu_cb); /* functions for making sure all keyframes are in good order */ void ANIM_editkeyframes_refresh(struct bAnimContext *ac); -- cgit v1.2.3