archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Code reshuffling to prevent problems like the previous commit happening again

Browse Source
This commit is contained in:
Joshua Leung
2016-02-26 15:39:02 +13:00
parent 1db29781db
commit 9177bf2f30
1 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
source/blender/editors/include/ED_keyframes_edit.h
View File

@@ -116,33 +116,7 @@ struct KeyframeEdit_CircleData {
/* ************************************************ */
/* Non-Destuctive Editing API (keyframes_edit.c) */
/* --- Generic Properties for Keyframe Edit Tools ----- */
typedef struct KeyframeEditData {
/* generic properties/data access */
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 */
float f1, f2; /* storage of times/values as 'decimals' */
int i1, i2; /* storage of times/values/flags as 'whole' numbers */
/* current iteration data */
struct FCurve *fcu; /* F-Curve that is being iterated over */
int curIndex; /* index of current keyframe being iterated over */
/* flags */
short curflags; /* current flags for the keyframe we're reached in the iteration process (eKeyframeVertOk) */
short iterflags; /* settings for iteration process (eKeyframeIterFlags) */
} KeyframeEditData;
/* ------- Function Pointer Typedefs ---------------- */
/* callback function that refreshes the F-Curve after use */
typedef void (*FcuEditFunc)(struct FCurve *fcu);
/* callback function that operates on the given BezTriple */
typedef short (*KeyframeEditFunc)(KeyframeEditData *ked, struct BezTriple *bezt);
/* ---------- Defines for 'OK' polls ----------------- */
/* --- Defines for 'OK' polls + KeyframeEditData Flags --------- */
/* which verts of a keyframe is active (after polling) */
typedef enum eKeyframeVertOk {
@@ -170,6 +144,33 @@ typedef enum eKeyframeIterFlags {
KED_F2_NLA_UNMAP = (1 << 2),
} eKeyframeIterFlags;
/* --- Generic Properties for Keyframe Edit Tools ----- */
typedef struct KeyframeEditData {
/* generic properties/data access */
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 */
float f1, f2; /* storage of times/values as 'decimals' */
int i1, i2; /* storage of times/values/flags as 'whole' numbers */
/* current iteration data */
struct FCurve *fcu; /* F-Curve that is being iterated over */
int curIndex; /* index of current keyframe being iterated over */
/* flags */
eKeyframeVertOk curflags; /* current flags for the keyframe we're reached in the iteration process */
eKeyframeIterFlags iterflags; /* settings for iteration process */
} KeyframeEditData;
/* ------- Function Pointer Typedefs ---------------- */
/* callback function that refreshes the F-Curve after use */
typedef void (*FcuEditFunc)(struct FCurve *fcu);
/* callback function that operates on the given BezTriple */
typedef short (*KeyframeEditFunc)(KeyframeEditData *ked, struct BezTriple *bezt);
/* ------- Custom Data Type Defines ------------------ */
/* Custom data for remapping one range to another in a fixed way */