correct enums which were in fact variables defined in headers.
This commit is contained in:
@@ -114,7 +114,7 @@ void BKE_nla_tweakmode_exit(struct AnimData *adt);
|
||||
/* Time Mapping */
|
||||
|
||||
/* time mapping conversion modes */
|
||||
enum {
|
||||
enum eNlaTime_ConvertModes {
|
||||
/* convert from global time to strip time - for evaluation */
|
||||
NLATIME_CONVERT_EVAL = 0,
|
||||
/* convert from global time to strip time - for editing corrections */
|
||||
@@ -123,7 +123,7 @@ enum {
|
||||
/* convert from strip time to global time */
|
||||
// xxx old 1 invert
|
||||
NLATIME_CONVERT_MAP,
|
||||
} eNlaTime_ConvertModes;
|
||||
};
|
||||
|
||||
float BKE_nla_tweakedit_remap(struct AnimData *adt, float cframe, short mode);
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ typedef struct NlaEvalStrip {
|
||||
} NlaEvalStrip;
|
||||
|
||||
/* NlaEvalStrip->strip_mode */
|
||||
enum {
|
||||
enum eNlaEvalStrip_StripMode {
|
||||
/* standard evaluation */
|
||||
NES_TIME_BEFORE = -1,
|
||||
NES_TIME_WITHIN,
|
||||
@@ -58,7 +58,7 @@ enum {
|
||||
/* transition-strip evaluations */
|
||||
NES_TIME_TRANSITION_START,
|
||||
NES_TIME_TRANSITION_END,
|
||||
} eNlaEvalStrip_StripMode;
|
||||
};
|
||||
|
||||
|
||||
/* temp channel for accumulating data from NLA (avoids needing to clear all values first) */
|
||||
|
||||
@@ -472,7 +472,7 @@ void ANIM_timecode_string_from_frame(char *str, struct Scene *scene, int power,
|
||||
/* ---------- Current Frame Drawing ---------------- */
|
||||
|
||||
/* flags for Current Frame Drawing */
|
||||
enum {
|
||||
enum eAnimEditDraw_CurrentFrame {
|
||||
/* plain time indicator with no special indicators */
|
||||
DRAWCFRA_PLAIN = 0,
|
||||
/* draw box indicating current frame number */
|
||||
@@ -481,7 +481,7 @@ enum {
|
||||
DRAWCFRA_UNIT_SECONDS = (1 << 1),
|
||||
/* draw indicator extra wide (for timeline) */
|
||||
DRAWCFRA_WIDE = (1 << 2)
|
||||
} eAnimEditDraw_CurrentFrame;
|
||||
};
|
||||
|
||||
/* main call to draw current-frame indicator in an Animation Editor */
|
||||
void ANIM_draw_cfra(const struct bContext *C, struct View2D *v2d, short flag);
|
||||
|
||||
@@ -52,7 +52,7 @@ void transform_operatortypes(void);
|
||||
/* ******************** Macros & Prototypes *********************** */
|
||||
|
||||
/* MODE AND NUMINPUT FLAGS */
|
||||
enum {
|
||||
enum TfmMode {
|
||||
TFM_INIT = -1,
|
||||
TFM_DUMMY,
|
||||
TFM_TRANSLATION,
|
||||
@@ -85,7 +85,7 @@ enum {
|
||||
TFM_EDGE_SLIDE,
|
||||
TFM_VERT_SLIDE,
|
||||
TFM_SEQ_SLIDE
|
||||
} TfmMode;
|
||||
};
|
||||
|
||||
/* TRANSFORM CONTEXTS */
|
||||
#define CTX_NONE 0
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
* and settings for a View2D region, and that set of settings is used in more
|
||||
* than one specific place
|
||||
*/
|
||||
enum {
|
||||
enum eView2D_CommonViewTypes {
|
||||
/* custom view type (region has defined all necessary flags already) */
|
||||
V2D_COMMONVIEW_CUSTOM = -1,
|
||||
/* standard (only use this when setting up a new view, as a sensible base for most settings) */
|
||||
@@ -60,7 +60,7 @@ enum {
|
||||
V2D_COMMONVIEW_HEADER,
|
||||
/* ui region containing panels */
|
||||
V2D_COMMONVIEW_PANELS_UI
|
||||
} eView2D_CommonViewTypes;
|
||||
};
|
||||
|
||||
/* ---- Defines for Scroller/Grid Arguments ----- */
|
||||
|
||||
@@ -68,7 +68,7 @@ enum {
|
||||
#define V2D_ARG_DUMMY -1
|
||||
|
||||
/* Grid units */
|
||||
enum {
|
||||
enum eView2D_Units {
|
||||
/* for drawing time */
|
||||
V2D_UNIT_SECONDS = 0,
|
||||
V2D_UNIT_FRAMES,
|
||||
@@ -79,16 +79,16 @@ enum {
|
||||
V2D_UNIT_DEGREES,
|
||||
V2D_UNIT_TIME,
|
||||
V2D_UNIT_SECONDSSEQ
|
||||
} eView2D_Units;
|
||||
};
|
||||
|
||||
/* clamping of grid values to whole numbers */
|
||||
enum {
|
||||
enum eView2D_Clamp {
|
||||
V2D_GRID_NOCLAMP = 0,
|
||||
V2D_GRID_CLAMP
|
||||
} eView2D_Clamp;
|
||||
};
|
||||
|
||||
/* flags for grid-lines to draw */
|
||||
enum {
|
||||
enum eView2D_Gridlines {
|
||||
V2D_HORIZONTAL_LINES = (1 << 0),
|
||||
V2D_VERTICAL_LINES = (1 << 1),
|
||||
V2D_HORIZONTAL_AXIS = (1 << 2),
|
||||
@@ -97,7 +97,7 @@ enum {
|
||||
|
||||
V2D_GRIDLINES_MAJOR = (V2D_VERTICAL_LINES | V2D_VERTICAL_AXIS | V2D_HORIZONTAL_LINES | V2D_HORIZONTAL_AXIS),
|
||||
V2D_GRIDLINES_ALL = (V2D_GRIDLINES_MAJOR | V2D_HORIZONTAL_FINELINES),
|
||||
} eView2D_Gridlines;
|
||||
};
|
||||
|
||||
/* ------ Defines for Scrollers ----- */
|
||||
|
||||
|
||||
@@ -40,11 +40,11 @@ struct Mesh;
|
||||
struct HookModifierData;
|
||||
|
||||
/* add hook menu */
|
||||
enum {
|
||||
enum eObject_Hook_Add_Mode {
|
||||
OBJECT_ADDHOOK_NEWOB = 1,
|
||||
OBJECT_ADDHOOK_SELOB,
|
||||
OBJECT_ADDHOOK_SELOB_BONE
|
||||
} eObject_Hook_Add_Mode;
|
||||
};
|
||||
|
||||
/* internal exports only */
|
||||
|
||||
|
||||
@@ -60,19 +60,19 @@ void ACTION_OT_select_leftright(struct wmOperatorType *ot);
|
||||
void ACTION_OT_clickselect(struct wmOperatorType *ot);
|
||||
|
||||
/* defines for left-right select tool */
|
||||
enum {
|
||||
enum eActKeys_LeftRightSelect_Mode {
|
||||
ACTKEYS_LRSEL_TEST = 0,
|
||||
ACTKEYS_LRSEL_LEFT,
|
||||
ACTKEYS_LRSEL_RIGHT
|
||||
} eActKeys_LeftRightSelect_Mode;
|
||||
};
|
||||
|
||||
/* defines for column-select mode */
|
||||
enum {
|
||||
enum eActKeys_ColumnSelect_Mode {
|
||||
ACTKEYS_COLUMNSEL_KEYS = 0,
|
||||
ACTKEYS_COLUMNSEL_CFRA,
|
||||
ACTKEYS_COLUMNSEL_MARKERS_COLUMN,
|
||||
ACTKEYS_COLUMNSEL_MARKERS_BETWEEN,
|
||||
} eActKeys_ColumnSelect_Mode;
|
||||
};
|
||||
|
||||
/* ***************************************** */
|
||||
/* action_edit.c */
|
||||
@@ -107,22 +107,22 @@ void ACTION_OT_markers_make_local(struct wmOperatorType *ot);
|
||||
/* defines for snap keyframes
|
||||
* NOTE: keep in sync with eEditKeyframes_Snap (in ED_keyframes_edit.h)
|
||||
*/
|
||||
enum {
|
||||
enum eActKeys_Snap_Mode {
|
||||
ACTKEYS_SNAP_CFRA = 1,
|
||||
ACTKEYS_SNAP_NEAREST_FRAME,
|
||||
ACTKEYS_SNAP_NEAREST_SECOND,
|
||||
ACTKEYS_SNAP_NEAREST_MARKER,
|
||||
} eActKeys_Snap_Mode;
|
||||
};
|
||||
|
||||
/* defines for mirror keyframes
|
||||
* NOTE: keep in sync with eEditKeyframes_Mirror (in ED_keyframes_edit.h)
|
||||
*/
|
||||
enum {
|
||||
enum eActKeys_Mirror_Mode {
|
||||
ACTKEYS_MIRROR_CFRA = 1,
|
||||
ACTKEYS_MIRROR_YAXIS,
|
||||
ACTKEYS_MIRROR_XAXIS,
|
||||
ACTKEYS_MIRROR_MARKER,
|
||||
} eActKeys_Mirror_Mode;
|
||||
};
|
||||
|
||||
/* ***************************************** */
|
||||
/* action_ops.c */
|
||||
|
||||
@@ -69,19 +69,19 @@ void GRAPH_OT_select_leftright(struct wmOperatorType *ot);
|
||||
void GRAPH_OT_clickselect(struct wmOperatorType *ot);
|
||||
|
||||
/* defines for left-right select tool */
|
||||
enum {
|
||||
enum eGraphKeys_LeftRightSelect_Mode {
|
||||
GRAPHKEYS_LRSEL_TEST = 0,
|
||||
GRAPHKEYS_LRSEL_LEFT,
|
||||
GRAPHKEYS_LRSEL_RIGHT
|
||||
} eGraphKeys_LeftRightSelect_Mode;
|
||||
};
|
||||
|
||||
/* defines for column-select mode */
|
||||
enum {
|
||||
enum eGraphKeys_ColumnSelect_Mode {
|
||||
GRAPHKEYS_COLUMNSEL_KEYS = 0,
|
||||
GRAPHKEYS_COLUMNSEL_CFRA,
|
||||
GRAPHKEYS_COLUMNSEL_MARKERS_COLUMN,
|
||||
GRAPHKEYS_COLUMNSEL_MARKERS_BETWEEN,
|
||||
} eGraphKeys_ColumnSelect_Mode;
|
||||
};
|
||||
|
||||
/* ***************************************** */
|
||||
/* graph_edit.c */
|
||||
@@ -119,25 +119,25 @@ void GRAPH_OT_mirror(struct wmOperatorType *ot);
|
||||
/* defines for snap keyframes
|
||||
* NOTE: keep in sync with eEditKeyframes_Snap (in ED_keyframes_edit.h)
|
||||
*/
|
||||
enum {
|
||||
enum eGraphKeys_Snap_Mode {
|
||||
GRAPHKEYS_SNAP_CFRA = 1,
|
||||
GRAPHKEYS_SNAP_NEAREST_FRAME,
|
||||
GRAPHKEYS_SNAP_NEAREST_SECOND,
|
||||
GRAPHKEYS_SNAP_NEAREST_MARKER,
|
||||
GRAPHKEYS_SNAP_HORIZONTAL,
|
||||
GRAPHKEYS_SNAP_VALUE,
|
||||
} eGraphKeys_Snap_Mode;
|
||||
};
|
||||
|
||||
/* defines for mirror keyframes
|
||||
* NOTE: keep in sync with eEditKeyframes_Mirror (in ED_keyframes_edit.h)
|
||||
*/
|
||||
enum {
|
||||
enum eGraphKeys_Mirror_Mode {
|
||||
GRAPHKEYS_MIRROR_CFRA = 1,
|
||||
GRAPHKEYS_MIRROR_YAXIS,
|
||||
GRAPHKEYS_MIRROR_XAXIS,
|
||||
GRAPHKEYS_MIRROR_MARKER,
|
||||
GRAPHKEYS_MIRROR_VALUE,
|
||||
} eGraphKeys_Mirror_Mode;
|
||||
};
|
||||
|
||||
/* ----------- */
|
||||
|
||||
|
||||
@@ -54,12 +54,12 @@ void draw_nla_channel_list(bContext *C, bAnimContext *ac, ARegion *ar);
|
||||
/* nla_select.c */
|
||||
|
||||
/* defines for left-right select tool */
|
||||
enum {
|
||||
enum eNlaEdit_LeftRightSelect_Mode {
|
||||
NLAEDIT_LRSEL_TEST = -1,
|
||||
NLAEDIT_LRSEL_NONE,
|
||||
NLAEDIT_LRSEL_LEFT,
|
||||
NLAEDIT_LRSEL_RIGHT
|
||||
} eNlaEdit_LeftRightSelect_Mode;
|
||||
};
|
||||
|
||||
/* --- */
|
||||
|
||||
@@ -73,12 +73,12 @@ void NLA_OT_click_select(wmOperatorType *ot);
|
||||
|
||||
/* defines for snap strips
|
||||
*/
|
||||
enum {
|
||||
enum eNlaEdit_Snap_Mode {
|
||||
NLAEDIT_SNAP_CFRA = 1,
|
||||
NLAEDIT_SNAP_NEAREST_FRAME,
|
||||
NLAEDIT_SNAP_NEAREST_SECOND,
|
||||
NLAEDIT_SNAP_NEAREST_MARKER
|
||||
} eNlaEdit_Snap_Mode;
|
||||
};
|
||||
|
||||
/* --- */
|
||||
|
||||
|
||||
@@ -237,7 +237,7 @@ extern const char *node_context_dir[];
|
||||
#define NODE_LINK_RESOL 12
|
||||
|
||||
// XXX button events (butspace)
|
||||
enum {
|
||||
enum eNodeSpace_ButEvents {
|
||||
B_NOP = 0,
|
||||
B_REDR = 1,
|
||||
B_NODE_USEMAT,
|
||||
@@ -254,6 +254,6 @@ enum {
|
||||
B_MATPRV,
|
||||
B_NODE_LOADIMAGE,
|
||||
B_NODE_SETIMAGE,
|
||||
} eNodeSpace_ButEvents;
|
||||
};
|
||||
|
||||
#endif /* __NODE_INTERN_H__ */
|
||||
|
||||
Reference in New Issue
Block a user