Cleanup: commas at the end of enums

Without this clang-format may wrap them onto a single line.
This commit is contained in:
2019-01-15 23:57:49 +11:00
parent d4c851b976
commit 665acf22bd
102 changed files with 279 additions and 279 deletions

View File

@@ -153,7 +153,7 @@ typedef enum DMDrawFlag {
DM_DRAW_SKIP_HIDDEN = (1 << 4),
DM_DRAW_SKIP_SELECT = (1 << 5),
DM_DRAW_SELECT_USE_EDITMODE = (1 << 6),
DM_DRAW_NEED_NORMALS = (1 << 7)
DM_DRAW_NEED_NORMALS = (1 << 7),
} DMDrawFlag;
typedef enum DMForeachFlag {

View File

@@ -90,7 +90,7 @@ typedef enum eAction_TransformFlags {
/* all flags */
ACT_TRANS_ONLY = (ACT_TRANS_LOC | ACT_TRANS_ROT | ACT_TRANS_SCALE),
ACT_TRANS_ALL = (ACT_TRANS_ONLY | ACT_TRANS_PROP)
ACT_TRANS_ALL = (ACT_TRANS_ONLY | ACT_TRANS_PROP),
} eAction_TransformFlags;
/* Return flags indicating which transforms the given object/posechannel has

View File

@@ -85,7 +85,7 @@ typedef enum eAnimData_MergeCopy_Modes {
ADT_MERGECOPY_SRC_COPY = 1,
/* Use src action (but just reference the existing version) */
ADT_MERGECOPY_SRC_REF = 2
ADT_MERGECOPY_SRC_REF = 2,
} eAnimData_MergeCopy_Modes;
void BKE_animdata_merge_copy(

View File

@@ -179,7 +179,7 @@ typedef enum eFMI_Requirement_Flags {
FMI_REQUIRES_RUNTIME_CHECK = (1 << 2),
/* Requires to store data shared between time and valua evaluation */
FMI_REQUIRES_STORAGE = (1 << 3)
FMI_REQUIRES_STORAGE = (1 << 3),
} eFMI_Requirement_Flags;
/* Function Prototypes for FModifierTypeInfo's */

View File

@@ -92,7 +92,7 @@ typedef enum eGP_GetFrame_Mode {
/* Add a new empty/blank frame */
GP_GETFRAME_ADD_NEW = 1,
/* Make a copy of the active frame */
GP_GETFRAME_ADD_COPY = 2
GP_GETFRAME_ADD_COPY = 2,
} eGP_GetFrame_Mode;
struct bGPDframe *BKE_gpencil_layer_getframe(struct bGPDlayer *gpl, int cframe, eGP_GetFrame_Mode addnew);

View File

@@ -149,7 +149,7 @@ struct RenderResult;
enum {
IMA_GENTYPE_BLANK = 0,
IMA_GENTYPE_GRID = 1,
IMA_GENTYPE_GRID_COLOR = 2
IMA_GENTYPE_GRID_COLOR = 2,
};
/* ima->ok */

View File

@@ -99,7 +99,7 @@ struct BezTriple *BKE_mask_spline_point_next_bezt(struct MaskSpline *spline, str
typedef enum {
MASK_PROJ_NEG = -1,
MASK_PROJ_ANY = 0,
MASK_PROJ_POS = 1
MASK_PROJ_POS = 1,
} eMaskSign;
float BKE_mask_spline_project_co(struct MaskSpline *spline, struct MaskSplinePoint *point,
float start_u, const float co[2], const eMaskSign sign);

View File

@@ -69,7 +69,7 @@ typedef enum {
MULTIRES_USE_LOCAL_MMD = 1,
MULTIRES_USE_RENDER_PARAMS = 2,
MULTIRES_ALLOC_PAINT_MASK = 4,
MULTIRES_IGNORE_SIMPLIFY = 8
MULTIRES_IGNORE_SIMPLIFY = 8,
} MultiresFlags;
struct DerivedMesh *multires_make_derived_from_derived(struct DerivedMesh *dm,

View File

@@ -79,7 +79,7 @@ typedef enum ePaintMode {
PAINT_MODE_SCULPT_UV = 5,
/** Keep last. */
PAINT_MODE_INVALID = 6
PAINT_MODE_INVALID = 6,
} ePaintMode;
/* overlay invalidation */
@@ -89,7 +89,7 @@ typedef enum eOverlayControlFlags {
PAINT_OVERLAY_INVALID_CURVE = (1 << 3),
PAINT_OVERLAY_OVERRIDE_CURSOR = (1 << 4),
PAINT_OVERLAY_OVERRIDE_PRIMARY = (1 << 5),
PAINT_OVERLAY_OVERRIDE_SECONDARY = (1 << 6)
PAINT_OVERLAY_OVERRIDE_SECONDARY = (1 << 6),
} eOverlayControlFlags;
#define PAINT_OVERRIDE_MASK \
@@ -263,6 +263,6 @@ void BKE_sculpt_toolsettings_data_ensure(struct Scene *scene);
enum {
SCULPT_MASK_LAYER_CALC_VERT = (1 << 0),
SCULPT_MASK_LAYER_CALC_LOOP = (1 << 1)
SCULPT_MASK_LAYER_CALC_LOOP = (1 << 1),
};
#endif

View File

@@ -96,7 +96,7 @@ typedef enum MultiresModifiedFlags {
* have to be updated */
MULTIRES_COORDS_MODIFIED = 1,
/* indicates elements have been hidden or unhidden */
MULTIRES_HIDDEN_MODIFIED = 2
MULTIRES_HIDDEN_MODIFIED = 2,
} MultiresModifiedFlags;
/**************************** Internal *****************************/

View File

@@ -131,7 +131,7 @@ extern int text_check_identifier_nodigit_unicode(const unsigned int ch);
enum {
TXT_MOVE_LINE_UP = -1,
TXT_MOVE_LINE_DOWN = 1
TXT_MOVE_LINE_DOWN = 1,
};
typedef struct TextUndoBuf {

View File

@@ -66,7 +66,7 @@ struct ModifierData;
enum {
DAG_WHITE = 0,
DAG_GRAY = 1,
DAG_BLACK = 2
DAG_BLACK = 2,
};
typedef struct DagAdjList {

View File

@@ -112,7 +112,7 @@ struct PBVHNode {
};
typedef enum {
PBVH_DYNTOPO_SMOOTH_SHADING = 1
PBVH_DYNTOPO_SMOOTH_SHADING = 1,
} PBVHFlags;
typedef struct PBVHBMeshLog PBVHBMeshLog;

View File

@@ -131,7 +131,7 @@ typedef enum {
CCG_CALC_NORMALS = 4,
/* add an extra four bytes for a mask layer */
CCG_ALLOC_MASK = 8,
CCG_SIMPLE_SUBDIV = 16
CCG_SIMPLE_SUBDIV = 16,
} CCGFlags;
static CCGSubSurf *_getSubSurf(CCGSubSurf *prevSS, int subdivLevels,

View File

@@ -52,7 +52,7 @@ typedef struct TaskScheduler TaskScheduler;
enum {
TASK_SCHEDULER_AUTO_THREADS = 0,
TASK_SCHEDULER_SINGLE_THREAD = 1
TASK_SCHEDULER_SINGLE_THREAD = 1,
};
TaskScheduler *BLI_task_scheduler_create(int num_threads);

View File

@@ -55,7 +55,7 @@ typedef struct BlendHandle BlendHandle;
typedef enum eBlenFileType {
BLENFILETYPE_BLEND = 1,
BLENFILETYPE_PUB = 2,
BLENFILETYPE_RUNTIME = 3
BLENFILETYPE_RUNTIME = 3,
} eBlenFileType;
typedef struct BlendFileData {

View File

@@ -260,7 +260,7 @@ enum {
BM_VERT = 1,
BM_EDGE = 2,
BM_LOOP = 4,
BM_FACE = 8
BM_FACE = 8,
};
#define BM_ALL (BM_VERT | BM_EDGE | BM_LOOP | BM_FACE)

View File

@@ -75,7 +75,7 @@ typedef enum BMIterType {
* from the other faces in the radial cycle surrounding the
* input loop's edge.*/
BM_LOOPS_OF_LOOP = 12,
BM_LOOPS_OF_EDGE = 13
BM_LOOPS_OF_EDGE = 13,
} BMIterType;
#define BM_ITYPE_MAX 14

View File

@@ -38,7 +38,7 @@ typedef enum {
typedef enum {
BMW_FLAG_NOP = 0,
BMW_FLAG_TEST_HIDDEN = (1 << 0)
BMW_FLAG_TEST_HIDDEN = (1 << 0),
} BMWFlag;
/*Walkers*/

View File

@@ -44,7 +44,7 @@
enum {
EXT_INPUT = 1,
EXT_KEEP = 2,
EXT_DEL = 4
EXT_DEL = 4,
};
#define VERT_MARK 1

View File

@@ -51,7 +51,7 @@ typedef enum {
HULL_FLAG_OUTPUT_GEOM = (1 << 2),
HULL_FLAG_DEL = (1 << 3),
HULL_FLAG_HOLE = (1 << 4)
HULL_FLAG_HOLE = (1 << 4),
} HullFlags;
/* Store hull triangles separate from BMesh faces until the end; this

View File

@@ -76,7 +76,7 @@
typedef enum CD_UseFlag {
CD_DO_VERT = (1 << 0),
CD_DO_EDGE = (1 << 1),
CD_DO_LOOP = (1 << 2)
CD_DO_LOOP = (1 << 2),
} CD_UseFlag;

View File

@@ -168,7 +168,7 @@ static bool bm_vert_dissolve_fan(BMesh *bm, BMVert *v)
enum {
VERT_INDEX_DO_COLLAPSE = -1,
VERT_INDEX_INIT = 0,
VERT_INDEX_IGNORE = 1
VERT_INDEX_IGNORE = 1,
};
// #define USE_WALKER /* gives uneven results, disable for now */

View File

@@ -99,7 +99,7 @@ private:
// INANIMATE = 0,
LIGHT_COLOR = 2,
LIGHT_FOA = 4,
LIGHT_FOE = 8
LIGHT_FOE = 8,
};
enum cameraAnim
@@ -110,7 +110,7 @@ private:
CAMERA_YFOV = 8,
CAMERA_YMAG = 16,
CAMERA_ZFAR = 32,
CAMERA_ZNEAR = 64
CAMERA_ZNEAR = 64,
};
enum matAnim
@@ -119,7 +119,7 @@ private:
MATERIAL_SPEC_COLOR = 4,
MATERIAL_DIFF_COLOR = 1 << 3,
MATERIAL_TRANSPARENCY = 1 << 4,
MATERIAL_IOR = 1 << 5
MATERIAL_IOR = 1 << 5,
};
enum AnimationType

View File

@@ -33,7 +33,7 @@ typedef enum DataType {
/** \brief Vector data type */
COM_DT_VECTOR = 2,
/** \brief Color data type */
COM_DT_COLOR = 4
COM_DT_COLOR = 4,
} DataType;
/**
@@ -47,7 +47,7 @@ typedef enum CompositorQuality {
/** \brief Medium quality setting */
COM_QUALITY_MEDIUM = 1,
/** \brief Low quality setting */
COM_QUALITY_LOW = 2
COM_QUALITY_LOW = 2,
} CompositorQuality;
/**
@@ -60,7 +60,7 @@ typedef enum CompositorPriority {
/** \brief Medium quality setting */
COM_PRIORITY_MEDIUM = 1,
/** \brief Low quality setting */
COM_PRIORITY_LOW = 0
COM_PRIORITY_LOW = 0,
} CompositorPriority;
// configurable items
@@ -98,7 +98,7 @@ typedef enum OrderOfChunks {
/** \brief no ordering */
COM_TO_TOP_DOWN = 2,
/** \brief experimental ordering with 9 hotspots */
COM_TO_RULE_OF_THIRDS = 3
COM_TO_RULE_OF_THIRDS = 3,
} OrderOfChunks;
#define COM_ORDER_OF_CHUNKS_DEFAULT COM_TO_CENTER_OUT

View File

@@ -54,7 +54,7 @@ typedef enum ChunkExecutionState {
/**
* \brief chunk is executed.
*/
COM_ES_EXECUTED = 2
COM_ES_EXECUTED = 2,
} ChunkExecutionState;
/**

View File

@@ -44,7 +44,7 @@ typedef enum MemoryBufferState {
/** \brief memory is available for use, content has been created */
COM_MB_AVAILABLE = 2,
/** \brief chunk is consolidated from other chunks. special state.*/
COM_MB_TEMPORARILY = 6
COM_MB_TEMPORARILY = 6,
} MemoryBufferState;
typedef enum MemoryBufferExtend {

View File

@@ -68,7 +68,7 @@ typedef enum InputResizeMode {
/** \brief Fit the width or the height of the input image to the width or height of the working area of the node, image will be larger than the working area */
COM_SC_FIT = NS_CR_FIT,
/** \brief Fit the width and the height of the input image to the width and height of the working area of the node, image will be equally larger than the working area */
COM_SC_STRETCH = NS_CR_STRETCH
COM_SC_STRETCH = NS_CR_STRETCH,
} InputResizeMode;
/**

View File

@@ -32,7 +32,7 @@
typedef enum PixelSampler {
COM_PS_NEAREST = 0,
COM_PS_BILINEAR = 1,
COM_PS_BICUBIC = 2
COM_PS_BICUBIC = 2,
} PixelSampler;
class MemoryBuffer;

View File

@@ -45,7 +45,7 @@ public:
enum {
FAST_GAUSS_OVERLAY_MIN = -1,
FAST_GAUSS_OVERLAY_NONE = 0,
FAST_GAUSS_OVERLAY_MAX = 1
FAST_GAUSS_OVERLAY_MAX = 1,
};
class FastGaussianBlurValueOperation : public NodeOperation {

View File

@@ -37,7 +37,7 @@ protected:
public:
enum BlurAxis {
BLUR_AXIS_X = 0,
BLUR_AXIS_Y = 1
BLUR_AXIS_Y = 1,
};
KeyingBlurOperation();

View File

@@ -703,7 +703,7 @@ typedef enum eRearrangeAnimChan_Mode {
REARRANGE_ANIMCHAN_TOP = -2,
REARRANGE_ANIMCHAN_UP = -1,
REARRANGE_ANIMCHAN_DOWN = 1,
REARRANGE_ANIMCHAN_BOTTOM = 2
REARRANGE_ANIMCHAN_BOTTOM = 2,
} eRearrangeAnimChan_Mode;
/* defines for rearranging channels */

View File

@@ -70,13 +70,13 @@ typedef enum {
typedef enum {
METHOD_BRUTE_FORCE = 0,
METHOD_MEMOIZE = 1
METHOD_MEMOIZE = 1,
} RetargetMethod;
typedef enum {
ARC_FREE = 0,
ARC_TAKEN = 1,
ARC_USED = 2
ARC_USED = 2,
} ArcUsageFlags;
static RigGraph *GLOBAL_RIGG = NULL;

View File

@@ -157,7 +157,7 @@ static const EnumPropertyItem prop_channels_types[] = {
typedef enum ePoseSlide_AxisLock {
PS_LOCK_X = (1 << 0),
PS_LOCK_Y = (1 << 1),
PS_LOCK_Z = (1 << 2)
PS_LOCK_Z = (1 << 2),
} ePoseSlide_AxisLock;
/* Property enum for ePoseSlide_AxisLock */

View File

@@ -280,7 +280,7 @@ void GPENCIL_OT_layer_remove(wmOperatorType *ot)
enum {
GP_LAYER_MOVE_UP = -1,
GP_LAYER_MOVE_DOWN = 1
GP_LAYER_MOVE_DOWN = 1,
};
static int gp_layer_move_exec(bContext *C, wmOperator *op)
@@ -783,7 +783,7 @@ enum {
GP_STROKE_MOVE_UP = -1,
GP_STROKE_MOVE_DOWN = 1,
GP_STROKE_MOVE_TOP = 2,
GP_STROKE_MOVE_BOTTOM = 3
GP_STROKE_MOVE_BOTTOM = 3,
};
static int gp_stroke_arrange_exec(bContext *C, wmOperator *op)
@@ -1173,7 +1173,7 @@ void GPENCIL_OT_brush_change(wmOperatorType *ot)
enum {
GP_BRUSH_MOVE_UP = -1,
GP_BRUSH_MOVE_DOWN = 1
GP_BRUSH_MOVE_DOWN = 1,
};
static int gp_brush_move_exec(bContext *C, wmOperator *op)
@@ -1932,7 +1932,7 @@ void GPENCIL_OT_palettecolor_unlock_all(wmOperatorType *ot)
enum {
GP_COLOR_MOVE_UP = -1,
GP_COLOR_MOVE_DOWN = 1
GP_COLOR_MOVE_DOWN = 1,
};
static int gp_palettecolor_move_exec(bContext *C, wmOperator *op)

View File

@@ -527,7 +527,7 @@ static bool gp_strokes_paste_poll(bContext *C)
typedef enum eGP_PasteMode {
GP_COPY_ONLY = -1,
GP_COPY_MERGE = 1
GP_COPY_MERGE = 1,
} eGP_PasteMode;
static int gp_strokes_paste_exec(bContext *C, wmOperator *op)
@@ -1677,7 +1677,7 @@ void GPENCIL_OT_stroke_apply_thickness(wmOperatorType *ot)
enum {
GP_STROKE_CYCLIC_CLOSE = 1,
GP_STROKE_CYCLIC_OPEN = 2,
GP_STROKE_CYCLIC_TOGGLE = 3
GP_STROKE_CYCLIC_TOGGLE = 3,
};
static int gp_stroke_cyclical_set_exec(bContext *C, wmOperator *op)

View File

@@ -222,7 +222,7 @@ void GPENCIL_OT_convert(struct wmOperatorType *ot);
enum {
GP_STROKE_JOIN = -1,
GP_STROKE_JOINCOPY = 1
GP_STROKE_JOINCOPY = 1,
};
void GPENCIL_OT_stroke_arrange(struct wmOperatorType *ot);

View File

@@ -285,7 +285,7 @@ typedef enum eAnimFilter_Flags {
ANIMFILTER_TMP_PEEK = (1 << 30),
/** ignore ONLYSEL flag from filterflag, (internal use only!) */
ANIMFILTER_TMP_IGNORE_ONLYSEL = (1u << 31)
ANIMFILTER_TMP_IGNORE_ONLYSEL = (1u << 31),
} eAnimFilter_Flags;
/* ---------- Flag Checking Macros ------------ */
@@ -432,7 +432,7 @@ typedef enum eAnimChannel_Role {
/** special purposes - not generally for hierarchy processing */
ACHANNEL_ROLE_SPECIAL = 0,
/** data channel - a channel representing one of the actual building blocks of channels */
ACHANNEL_ROLE_CHANNEL = 1
ACHANNEL_ROLE_CHANNEL = 1,
} eAnimChannel_Role;
/* flag-setting behavior */
@@ -444,7 +444,7 @@ typedef enum eAnimChannels_SetFlag {
/** on->off, off->on */
ACHANNEL_SETFLAG_INVERT = 2,
/** some on -> all off // all on */
ACHANNEL_SETFLAG_TOGGLE = 3
ACHANNEL_SETFLAG_TOGGLE = 3,
} eAnimChannels_SetFlag;
/* types of settings for AnimChannels */
@@ -571,7 +571,7 @@ enum eAnimEditDraw_CurrentFrame {
/* time indication in seconds or frames */
DRAWCFRA_UNIT_SECONDS = (1 << 1),
/* draw indicator extra wide (for timeline) */
DRAWCFRA_WIDE = (1 << 2)
DRAWCFRA_WIDE = (1 << 2),
};
/* main call to draw current-frame indicator in an Animation Editor */

View File

@@ -73,7 +73,7 @@ typedef enum eEditKeyframes_Select {
/* remove ok keyframes from selection */
SELECT_SUBTRACT = (1 << 2),
/* flip ok status of keyframes based on key status */
SELECT_INVERT = (1 << 3)
SELECT_INVERT = (1 << 3),
} eEditKeyframes_Select;
/* "selection map" building modes */
@@ -134,7 +134,7 @@ typedef enum eKeyframeVertOk {
/* 'handle 2' is ok */
KEYFRAME_OK_H2 = (1 << 2),
/* all flags */
KEYFRAME_OK_ALL = (KEYFRAME_OK_KEY | KEYFRAME_OK_H1 | KEYFRAME_OK_H2)
KEYFRAME_OK_ALL = (KEYFRAME_OK_KEY | KEYFRAME_OK_H1 | KEYFRAME_OK_H2),
} eKeyframeVertOk;
/* Flags for use during iteration */

View File

@@ -50,7 +50,7 @@ typedef enum {
NODE_TOP = 1,
NODE_BOTTOM = 2,
NODE_LEFT = 4,
NODE_RIGHT = 8
NODE_RIGHT = 8,
} NodeBorder;
#define NODE_GRID_STEPS 5

View File

@@ -56,7 +56,7 @@ enum {
/* don't drop frames (and ignore SCE_FRAME_DROP flag) */
ANIMPLAY_FLAG_NO_SYNC = (1 << 3),
/* use nextfra at next timer update */
ANIMPLAY_FLAG_USE_NEXT_FRAME = (1 << 4)
ANIMPLAY_FLAG_USE_NEXT_FRAME = (1 << 4),
};
/* ----------------------------------------------------- */

View File

@@ -132,7 +132,7 @@ typedef enum {
/** outside window bounds */
V3D_PROJ_RET_CLIP_WIN = 4,
/** outside range (mainly for short), (can't avoid) */
V3D_PROJ_RET_OVERFLOW = 5
V3D_PROJ_RET_OVERFLOW = 5,
} eV3DProjStatus;
/* some clipping tests are optional */
@@ -141,7 +141,7 @@ typedef enum {
V3D_PROJ_TEST_CLIP_BB = (1 << 0),
V3D_PROJ_TEST_CLIP_WIN = (1 << 1),
V3D_PROJ_TEST_CLIP_NEAR = (1 << 2),
V3D_PROJ_TEST_CLIP_ZERO = (1 << 3)
V3D_PROJ_TEST_CLIP_ZERO = (1 << 3),
} eV3DProjTest;
#define V3D_PROJ_TEST_CLIP_DEFAULT \

View File

@@ -894,7 +894,7 @@ enum {
UI_CNR_BOTTOM_LEFT = (1 << 3),
/* just for convenience */
UI_CNR_NONE = 0,
UI_CNR_ALL = (UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT)
UI_CNR_ALL = (UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT),
};
/* not apart of the corner flags but mixed in some functions */

View File

@@ -111,7 +111,7 @@ void LATTICE_OT_make_regular(wmOperatorType *ot)
typedef enum eLattice_FlipAxes {
LATTICE_FLIP_U = 0,
LATTICE_FLIP_V = 1,
LATTICE_FLIP_W = 2
LATTICE_FLIP_W = 2,
} eLattice_FlipAxes;
/**

View File

@@ -459,7 +459,7 @@ enum {
SLIDE_ACTION_POINT = 1,
SLIDE_ACTION_HANDLE = 2,
SLIDE_ACTION_FEATHER = 3,
SLIDE_ACTION_SPLINE = 4
SLIDE_ACTION_SPLINE = 4,
};
typedef struct SlidePointData {

View File

@@ -408,7 +408,7 @@ typedef struct UnorderedLoopPair {
} UnorderedLoopPair;
enum {
ULP_FLIP_0 = (1 << 0),
ULP_FLIP_1 = (1 << 1)
ULP_FLIP_1 = (1 << 1),
};
static UnorderedLoopPair *edbm_tagged_loop_pairs_to_fill(BMesh *bm)

View File

@@ -254,7 +254,7 @@ static DerivedMesh *multiresbake_create_hiresdm(Scene *scene, Object *ob, int *l
typedef enum ClearFlag {
CLEAR_TANGENT_NORMAL = 1,
CLEAR_DISPLACEMENT = 2
CLEAR_DISPLACEMENT = 2,
} ClearFlag;

View File

@@ -3628,7 +3628,7 @@ static void vgroup_sort_bone_hierarchy(Object *ob, ListBase *bonebase)
enum {
SORT_TYPE_NAME = 0,
SORT_TYPE_BONEHIERARCHY = 1
SORT_TYPE_BONEHIERARCHY = 1,
};
static int vertex_group_sort_exec(bContext *C, wmOperator *op)

View File

@@ -96,7 +96,7 @@ void image_undo_end_locks(void)
typedef enum {
COPY = 0,
RESTORE = 1,
RESTORE_COPY = 2
RESTORE_COPY = 2,
} CopyMode;
static void undo_copy_tile(UndoImageTile *tile, ImBuf *tmpibuf, ImBuf *ibuf, CopyMode mode)

View File

@@ -566,13 +566,13 @@ typedef enum {
typedef enum {
STENCIL_PRIMARY = 0,
STENCIL_SECONDARY = 1
STENCIL_SECONDARY = 1,
} StencilTextureMode;
typedef enum {
STENCIL_CONSTRAINT_X = 1,
STENCIL_CONSTRAINT_Y = 2
STENCIL_CONSTRAINT_Y = 2,
} StencilConstraint;
typedef struct {

View File

@@ -540,7 +540,7 @@ typedef struct DMGradient_vertStore {
float weight_orig;
enum {
VGRAD_STORE_NOP = 0,
VGRAD_STORE_DW_EXIST = (1 << 0)
VGRAD_STORE_DW_EXIST = (1 << 0),
} flag;
} DMGradient_vertStore;

View File

@@ -169,7 +169,7 @@ static bool sculpt_brush_needs_rake_rotation(const Brush *brush)
typedef enum StrokeFlags {
CLIP_X = 1,
CLIP_Y = 2,
CLIP_Z = 4
CLIP_Z = 4,
} StrokeFlags;
/************** Access to original unmodified vertex data *************/

View File

@@ -108,7 +108,7 @@ static void file_deselect_all(SpaceFile *sfile, unsigned int flag)
typedef enum FileSelect {
FILE_SELECT_NOTHING = 0,
FILE_SELECT_DIR = 1,
FILE_SELECT_FILE = 2
FILE_SELECT_FILE = 2,
} FileSelect;
static void clamp_to_filelist(int numfiles, FileSelection *sel)

View File

@@ -47,13 +47,13 @@ struct FileDirEntry;
typedef enum FileSelType {
FILE_SEL_REMOVE = 0,
FILE_SEL_ADD = 1,
FILE_SEL_TOGGLE = 2
FILE_SEL_TOGGLE = 2,
} FileSelType;
typedef enum FileCheckType {
CHECK_DIRS = 1,
CHECK_FILES = 2,
CHECK_ALL = 3
CHECK_ALL = 3,
} FileCheckType;
struct ListBase *folderlist_new(void);

View File

@@ -2379,7 +2379,7 @@ void IMAGE_OT_reload(wmOperatorType *ot)
enum {
GEN_CONTEXT_NONE = 0,
GEN_CONTEXT_PAINT_CANVAS = 1,
GEN_CONTEXT_PAINT_STENCIL = 2
GEN_CONTEXT_PAINT_STENCIL = 2,
};
static int image_new_exec(bContext *C, wmOperator *op)

View File

@@ -83,7 +83,7 @@
enum {
COM_RECALC_COMPOSITE = 1,
COM_RECALC_VIEWER = 2
COM_RECALC_VIEWER = 2,
};
typedef struct CompoJob {

View File

@@ -275,7 +275,7 @@ static void outliner_do_libdata_operation(
/* ******************************************** */
typedef enum eOutliner_PropSceneOps {
OL_SCENE_OP_DELETE = 1
OL_SCENE_OP_DELETE = 1,
} eOutliner_PropSceneOps;
static const EnumPropertyItem prop_scene_op_types[] = {

View File

@@ -121,7 +121,7 @@
typedef enum eWireDrawMode {
OBDRAW_WIRE_OFF = 0,
OBDRAW_WIRE_ON = 1,
OBDRAW_WIRE_ON_DEPTH = 2
OBDRAW_WIRE_ON_DEPTH = 2,
} eWireDrawMode;
typedef struct drawDMVerts_userData {

View File

@@ -92,7 +92,7 @@ typedef enum eFlyPanState {
/* mouse moved and checking needed,
* if no view altering is done its changed back to #FLY_AXISLOCK_STATE_IDLE */
FLY_AXISLOCK_STATE_ACTIVE = 2
FLY_AXISLOCK_STATE_ACTIVE = 2,
} eFlyPanState;
/* called in transform_ops.c, on each regeneration of keymaps */

View File

@@ -54,13 +54,13 @@ struct wmKeyConfig;
enum {
DRAW_PICKING = (1 << 0),
DRAW_CONSTCOLOR = (1 << 1),
DRAW_SCENESET = (1 << 2)
DRAW_SCENESET = (1 << 2),
};
/* draw_mesh_fancy/draw_mesh_textured draw_flags */
enum {
DRAW_MODIFIERS_PREVIEW = (1 << 0),
DRAW_FACE_SELECT = (1 << 1)
DRAW_FACE_SELECT = (1 << 1),
};
/* view3d_header.c */
@@ -168,7 +168,7 @@ enum {
V3D_CACHE_TEXT_WORLDSPACE = (1 << 1),
V3D_CACHE_TEXT_ASCII = (1 << 2),
V3D_CACHE_TEXT_GLOBALSPACE = (1 << 3),
V3D_CACHE_TEXT_LOCALCLIP = (1 << 4)
V3D_CACHE_TEXT_LOCALCLIP = (1 << 4),
};
int view3d_effective_drawtype(const struct View3D *v3d);

View File

@@ -67,7 +67,7 @@
/* Ruler Item (we can have many) */
enum {
RULERITEM_USE_ANGLE = (1 << 0), /* use protractor */
RULERITEM_USE_RAYCAST = (1 << 1)
RULERITEM_USE_RAYCAST = (1 << 1),
};
enum {

View File

@@ -687,7 +687,7 @@ void setNearestAxis(TransInfo *t);
typedef enum {
NO_GEARS = 0,
BIG_GEARS = 1,
SMALL_GEARS = 2
SMALL_GEARS = 2,
} GearsType;
void snapGridIncrement(TransInfo *t, float *val);

View File

@@ -72,7 +72,7 @@
#endif
typedef enum PBool {
P_TRUE = 1,
P_FALSE = 0
P_FALSE = 0,
} PBool;
/* Special Purpose Hash */
@@ -155,7 +155,7 @@ enum PVertFlag {
PVERT_SELECT = 2,
PVERT_INTERIOR = 4,
PVERT_COLLAPSE = 8,
PVERT_SPLIT = 16
PVERT_SPLIT = 16,
};
enum PEdgeFlag {
@@ -167,7 +167,7 @@ enum PEdgeFlag {
PEDGE_FILLED = 32,
PEDGE_COLLAPSE = 64,
PEDGE_COLLAPSE_EDGE = 128,
PEDGE_COLLAPSE_PAIR = 256
PEDGE_COLLAPSE_PAIR = 256,
};
/* for flipping faces */
@@ -176,7 +176,7 @@ enum PEdgeFlag {
enum PFaceFlag {
PFACE_CONNECTED = 1,
PFACE_FILLED = 2,
PFACE_COLLAPSE = 4
PFACE_COLLAPSE = 4,
};
/* Chart */
@@ -208,7 +208,7 @@ typedef struct PChart {
} PChart;
enum PChartFlag {
PCHART_NOPACK = 1
PCHART_NOPACK = 1,
};
enum PHandleState {

View File

@@ -37,7 +37,7 @@ typedef void ParamHandle; /* handle to a set of charts */
typedef intptr_t ParamKey; /* (hash) key for identifying verts and faces */
typedef enum ParamBool {
PARAM_TRUE = 1,
PARAM_FALSE = 0
PARAM_FALSE = 0,
} ParamBool;
/* Chart construction:

View File

@@ -53,7 +53,7 @@ typedef enum GPUBasicShaderOption {
GPU_SHADER_LINE = (1 << 7), /* draw lines */
GPU_SHADER_FLAT_NORMAL = (1 << 8), /* use flat normals */
GPU_SHADER_OPTIONS_NUM = 9,
GPU_SHADER_OPTION_COMBINATIONS = (1 << GPU_SHADER_OPTIONS_NUM)
GPU_SHADER_OPTION_COMBINATIONS = (1 << GPU_SHADER_OPTIONS_NUM),
} GPUBasicShaderOption;
/* Keep these in sync with gpu_shader_basic_frag.glsl */
@@ -69,7 +69,7 @@ typedef enum GPUBasicShaderStipple {
GPU_SHADER_STIPPLE_S3D_INTERLACE_COLUMN = 8,
GPU_SHADER_STIPPLE_S3D_INTERLACE_COLUMN_SWAP = 9,
GPU_SHADER_STIPPLE_S3D_INTERLACE_CHECKER = 10,
GPU_SHADER_STIPPLE_S3D_INTERLACE_CHECKER_SWAP = 11
GPU_SHADER_STIPPLE_S3D_INTERLACE_CHECKER_SWAP = 11,
} GPUBasicShaderStipple;
void GPU_basic_shaders_init(void);

View File

@@ -69,21 +69,21 @@ typedef enum GPUDeviceType {
GPU_DEVICE_INTEL = (1 << 2),
GPU_DEVICE_SOFTWARE = (1 << 3),
GPU_DEVICE_UNKNOWN = (1 << 4),
GPU_DEVICE_ANY = (0xff)
GPU_DEVICE_ANY = (0xff),
} GPUDeviceType;
typedef enum GPUOSType {
GPU_OS_WIN = (1 << 8),
GPU_OS_MAC = (1 << 9),
GPU_OS_UNIX = (1 << 10),
GPU_OS_ANY = (0xff00)
GPU_OS_ANY = (0xff00),
} GPUOSType;
typedef enum GPUDriverType {
GPU_DRIVER_OFFICIAL = (1 << 16),
GPU_DRIVER_OPENSOURCE = (1 << 17),
GPU_DRIVER_SOFTWARE = (1 << 18),
GPU_DRIVER_ANY = (0xff0000)
GPU_DRIVER_ANY = (0xff0000),
} GPUDriverType;
bool GPU_type_matches(GPUDeviceType device, GPUOSType os, GPUDriverType driver);

View File

@@ -80,7 +80,7 @@ typedef enum GPUType {
GPU_TEX2D = 1002,
GPU_SHADOW2D = 1003,
GPU_TEXCUBE = 1004,
GPU_ATTRIB = 3001
GPU_ATTRIB = 3001,
} GPUType;
typedef enum GPUBuiltin {
@@ -99,7 +99,7 @@ typedef enum GPUBuiltin {
GPU_PARTICLE_ANG_VELOCITY = (1 << 12),
GPU_LOC_TO_VIEW_MATRIX = (1 << 13),
GPU_INVERSE_LOC_TO_VIEW_MATRIX = (1 << 14),
GPU_OBJECT_INFO = (1 << 15)
GPU_OBJECT_INFO = (1 << 15),
} GPUBuiltin;
typedef enum GPUOpenGLBuiltin {
@@ -119,7 +119,7 @@ typedef enum GPUBlendMode {
GPU_BLEND_ALPHA = 2,
GPU_BLEND_CLIP = 4,
GPU_BLEND_ALPHA_SORT = 8,
GPU_BLEND_ALPHA_TO_COVERAGE = 16
GPU_BLEND_ALPHA_TO_COVERAGE = 16,
} GPUBlendMode;
typedef struct GPUNodeStack {

View File

@@ -66,10 +66,10 @@ static char *glsl_material_library = NULL;
/* type definitions and constants */
enum {
MAX_FUNCTION_NAME = 64
MAX_FUNCTION_NAME = 64,
};
enum {
MAX_PARAMETER = 32
MAX_PARAMETER = 32,
};
typedef enum {

View File

@@ -64,7 +64,7 @@ typedef enum {
GPU_NODE_LINK_IMAGE_NONE = 0,
GPU_NODE_LINK_IMAGE_BLENDER = 1,
GPU_NODE_LINK_IMAGE_PREVIEW = 2,
GPU_NODE_LINK_IMAGE_CUBE_MAP = 3
GPU_NODE_LINK_IMAGE_CUBE_MAP = 3,
} GPUNodeLinkImage;
struct GPUNode {

View File

@@ -229,7 +229,7 @@ enum IK_SegmentAxis {
IK_Z = 2,
IK_TRANS_X = 3,
IK_TRANS_Y = 4,
IK_TRANS_Z = 5
IK_TRANS_Z = 5,
};
static int initialize_chain(Object *ob, bPoseChannel *pchan_tip, bConstraint *con)

View File

@@ -209,7 +209,7 @@ typedef enum IMB_BlendMode {
IMB_BLEND_COPY = 1000,
IMB_BLEND_COPY_RGB = 1001,
IMB_BLEND_COPY_ALPHA = 1002
IMB_BLEND_COPY_ALPHA = 1002,
} IMB_BlendMode;
void IMB_blend_color_byte(unsigned char dst[4], unsigned char src1[4],
@@ -249,7 +249,7 @@ typedef enum IMB_Timecode_Type {
* device (*every* consumer camcorder can do
* that :) )*/
IMB_TC_RECORD_RUN_NO_GAPS = 8,
IMB_TC_MAX_SLOT = 4
IMB_TC_MAX_SLOT = 4,
} IMB_Timecode_Type;
typedef enum IMB_Proxy_Size {
@@ -258,7 +258,7 @@ typedef enum IMB_Proxy_Size {
IMB_PROXY_50 = 2,
IMB_PROXY_75 = 4,
IMB_PROXY_100 = 8,
IMB_PROXY_MAX_SLOT = 4
IMB_PROXY_MAX_SLOT = 4,
} IMB_Proxy_Size;
/* defaults to BL_proxy within the directory of the animation */

View File

@@ -308,7 +308,7 @@ extern const char *imb_ext_image_filepath_only[];
* \{ */
enum {
IMB_COLORMANAGE_IS_DATA = (1 << 0)
IMB_COLORMANAGE_IS_DATA = (1 << 0),
};
/** \} */

View File

@@ -61,7 +61,7 @@ typedef struct bMotionPathVert {
/* bMotionPathVert->flag */
typedef enum eMotionPathVert_Flag {
/* vert is selected */
MOTIONPATH_VERT_SEL = (1 << 0)
MOTIONPATH_VERT_SEL = (1 << 0),
} eMotionPathVert_Flag;
/* ........ */
@@ -90,7 +90,7 @@ typedef enum eMotionPath_Flag {
/* Custom colors */
MOTIONPATH_FLAG_CUSTOM = (1 << 2),
/* Draw lines or only points */
MOTIONPATH_FLAG_LINES = (1 << 3)
MOTIONPATH_FLAG_LINES = (1 << 3),
} eMotionPath_Flag;
/* Visualization General --------------------------- */
@@ -125,7 +125,7 @@ typedef struct bAnimVizSettings {
/* bAnimVizSettings->recalc */
typedef enum eAnimViz_RecalcFlags {
/* motionpaths need recalculating */
ANIMVIZ_RECALC_PATHS = (1 << 0)
ANIMVIZ_RECALC_PATHS = (1 << 0),
} eAnimViz_RecalcFlags;
@@ -138,13 +138,13 @@ typedef enum eOnionSkin_Types {
/* show ghosts within the specified frame range */
GHOST_TYPE_RANGE = 2,
/* show ghosts on keyframes within the specified range only */
GHOST_TYPE_KEYS = 3
GHOST_TYPE_KEYS = 3,
} eOnionSkin_Types;
/* bAnimVizSettings->ghost_flag */
typedef enum eOnionSkin_Flag {
/* only show selected bones in ghosts */
GHOST_FLAG_ONLYSEL = (1 << 0)
GHOST_FLAG_ONLYSEL = (1 << 0),
} eOnionSkin_Flag;
@@ -167,7 +167,7 @@ typedef enum eMotionPaths_ViewFlag {
/* find keyframes in whole action (instead of just in matching group name) */
MOTIONPATH_VIEW_KFACT = (1 << 3),
/* draw lines on path */
MOTIONPATH_VIEW_LINES = (1 << 4)
MOTIONPATH_VIEW_LINES = (1 << 4),
} eMotionPath_ViewFlag;
/* bAnimVizSettings->path_bakeflag */
@@ -178,7 +178,7 @@ typedef enum eMotionPaths_BakeFlag {
MOTIONPATH_BAKE_HEADS = (1 << 1),
/** motion paths exist for AnimVizSettings instance - set when calc for first time,
* and unset when clearing */
MOTIONPATH_BAKE_HAS_PATHS = (1 << 2)
MOTIONPATH_BAKE_HAS_PATHS = (1 << 2),
} eMotionPath_BakeFlag;
/* ************************************************ */
@@ -294,7 +294,7 @@ typedef enum ePchan_Flag {
POSE_HAS_IKS = (1 << 14),
#endif
/* spline IK solving */
POSE_IKSPLINE = (1 << 15)
POSE_IKSPLINE = (1 << 15),
} ePchan_Flag;
/* PoseChannel constflag (constraint detection) */
@@ -307,7 +307,7 @@ typedef enum ePchan_ConstFlag {
/* only for drawing Posemode too */
PCHAN_HAS_STRIDE = (1 << 4),
/* spline IK */
PCHAN_HAS_SPLINEIK = (1 << 5)
PCHAN_HAS_SPLINEIK = (1 << 5),
} ePchan_ConstFlag;
/* PoseChannel->ikflag */
@@ -325,7 +325,7 @@ typedef enum ePchan_IkFlag {
BONE_IK_NO_XDOF_TEMP = (1 << 10),
BONE_IK_NO_YDOF_TEMP = (1 << 11),
BONE_IK_NO_ZDOF_TEMP = (1 << 12)
BONE_IK_NO_ZDOF_TEMP = (1 << 12),
} ePchan_IkFlag;
/* PoseChannel->drawflag */
@@ -365,7 +365,7 @@ typedef enum eRotationModes {
ROT_MODE_AXISANGLE = -1,
ROT_MODE_MIN = ROT_MODE_AXISANGLE, /* sentinel for Py API */
ROT_MODE_MAX = ROT_MODE_ZYX
ROT_MODE_MAX = ROT_MODE_ZYX,
} eRotationModes;
/* Pose ------------------------------------ */
@@ -430,7 +430,7 @@ typedef enum ePose_Flags {
/* bPose->iksolver and bPose->ikparam->iksolver */
typedef enum ePose_IKSolverType {
IKSOLVER_STANDARD = 0,
IKSOLVER_ITASC = 1
IKSOLVER_ITASC = 1,
} ePose_IKSolverType;
/* header for all bPose->ikparam structures */
@@ -459,7 +459,7 @@ typedef enum eItasc_Flags {
ITASC_AUTO_STEP = (1 << 0),
ITASC_INITIAL_REITERATION = (1 << 1),
ITASC_REITERATION = (1 << 2),
ITASC_SIMULATION = (1 << 3)
ITASC_SIMULATION = (1 << 3),
} eItasc_Flags;
/* bItasc->solver */
@@ -521,7 +521,7 @@ typedef enum eActionGroup_Flag {
AGRP_MODIFIERS_OFF = (1 << 7),
AGRP_TEMP = (1 << 30),
AGRP_MOVED = (1u << 31)
AGRP_MOVED = (1u << 31),
} eActionGroup_Flag;
@@ -562,7 +562,7 @@ typedef enum eAction_Flags {
/* flags for evaluation/editing */
ACT_MUTED = (1 << 9),
ACT_PROTECTED = (1 << 10),
ACT_DISABLED = (1 << 11)
ACT_DISABLED = (1 << 11),
} eAction_Flags;
@@ -640,7 +640,7 @@ typedef enum eDopeSheet_FilterFlag {
ADS_FILTER_GP_3DONLY = (1 << 29),
/** combination filters (some only used at runtime) */
ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM | ADS_FILTER_NOMAT | ADS_FILTER_NOLAM | ADS_FILTER_NOCUR | ADS_FILTER_NOPART | ADS_FILTER_NOARM | ADS_FILTER_NOSPK | ADS_FILTER_NOMODIFIERS)
ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM | ADS_FILTER_NOMAT | ADS_FILTER_NOLAM | ADS_FILTER_NOCUR | ADS_FILTER_NOPART | ADS_FILTER_NOARM | ADS_FILTER_NOSPK | ADS_FILTER_NOMODIFIERS),
} eDopeSheet_FilterFlag;
/* DopeSheet general flags */
@@ -710,7 +710,7 @@ typedef enum eSAction_Flag {
/* don't perform realtime updates */
SACTION_NOREALTIMEUPDATES = (1 << 10),
/* move markers as well as keyframes */
SACTION_MARKERS_MOVE = (1 << 11)
SACTION_MARKERS_MOVE = (1 << 11),
} eSAction_Flag;
@@ -749,7 +749,7 @@ typedef enum eAnimEdit_AutoSnap {
/* snap to actual seconds (nla-action time) */
SACTSNAP_SECOND = 4,
/* snap to 1.0 second increments */
SACTSNAP_TSTEP = 5
SACTSNAP_TSTEP = 5,
} eAnimEdit_AutoSnap;
@@ -788,7 +788,7 @@ typedef enum eActionChannelFlag {
ACHAN_EXPANDED = (1 << 4),
ACHAN_SHOWIPO = (1 << 5),
ACHAN_SHOWCONS = (1 << 6),
ACHAN_MOVED = (1u << 31)
ACHAN_MOVED = (1u << 31),
} eActionChannelFlag;
#endif /* __DNA_ACTION_TYPES_H__ */

View File

@@ -100,7 +100,7 @@ typedef enum eFModifier_Flags {
/* restrict range that F-Modifier can be considered over */
FMODIFIER_FLAG_RANGERESTRICT = (1<<4),
/* use influence control */
FMODIFIER_FLAG_USEINFLUENCE = (1<<5)
FMODIFIER_FLAG_USEINFLUENCE = (1<<5),
} eFModifier_Flags;
/* --- */
@@ -121,7 +121,7 @@ typedef struct FMod_Generator {
/* generator modes */
typedef enum eFMod_Generator_Modes {
FCM_GENERATOR_POLYNOMIAL = 0,
FCM_GENERATOR_POLYNOMIAL_FACTORISED = 1
FCM_GENERATOR_POLYNOMIAL_FACTORISED = 1,
} eFMod_Generator_Modes;
@@ -130,7 +130,7 @@ typedef enum eFMod_Generator_Modes {
*/
typedef enum eFMod_Generator_Flags {
/* generator works in conjunction with other modifiers (i.e. doesn't replace those before it) */
FCM_GENERATOR_ADDITIVE = (1<<0)
FCM_GENERATOR_ADDITIVE = (1<<0),
} eFMod_Generator_Flags;
@@ -161,7 +161,7 @@ typedef enum eFMod_Generator_Functions {
FCM_GENERATOR_FN_TAN = 2,
FCM_GENERATOR_FN_SQRT = 3,
FCM_GENERATOR_FN_LN = 4,
FCM_GENERATOR_FN_SINC = 5
FCM_GENERATOR_FN_SINC = 5,
} eFMod_Generator_Functions;
@@ -225,7 +225,7 @@ typedef enum eFMod_Limit_Flags {
FCM_LIMIT_XMIN = (1<<0),
FCM_LIMIT_XMAX = (1<<1),
FCM_LIMIT_YMIN = (1<<2),
FCM_LIMIT_YMAX = (1<<3)
FCM_LIMIT_YMAX = (1<<3),
} eFMod_Limit_Flags;
@@ -538,7 +538,7 @@ typedef enum eFCurve_Flags {
FCURVE_DISCRETE_VALUES = (1<<12),
/** temporary tag for editing */
FCURVE_TAGGED = (1<<15)
FCURVE_TAGGED = (1<<15),
} eFCurve_Flags;
/* extrapolation modes (only simple value 'extending') */
@@ -674,7 +674,7 @@ typedef enum eNlaStrip_Extrapolate_Mode {
/* only hold+extend last frame */
NLASTRIP_EXTEND_HOLD_FORWARD = 1,
/* don't contribute at all */
NLASTRIP_EXTEND_NOTHING = 2
NLASTRIP_EXTEND_NOTHING = 2,
} eNlaStrip_Extrapolate_Mode;
/* NLA Strip Settings */
@@ -713,7 +713,7 @@ typedef enum eNlaStrip_Flag {
/* temporary editing flags */
/* NLA-Strip is really just a temporary meta used to facilitate easier transform code */
NLASTRIP_FLAG_TEMP_META = (1<<30),
NLASTRIP_FLAG_EDIT_TOUCHED = (1u << 31)
NLASTRIP_FLAG_EDIT_TOUCHED = (1u << 31),
} eNlaStrip_Flag;
/* NLA Strip Type */
@@ -765,7 +765,7 @@ typedef enum eNlaTrack_Flag {
/** track is not allowed to execute,
* usually as result of tweaking being enabled (internal flag) */
NLATRACK_DISABLED = (1<<10)
NLATRACK_DISABLED = (1<<10),
} eNlaTrack_Flag;
@@ -801,7 +801,7 @@ typedef struct KS_Path {
/* KS_Path->flag */
typedef enum eKSP_Settings {
/* entire array (not just the specified index) gets keyframed */
KSP_FLAG_WHOLE_ARRAY = (1<<0)
KSP_FLAG_WHOLE_ARRAY = (1<<0),
} eKSP_Settings;
/* KS_Path->groupmode */
@@ -855,7 +855,7 @@ typedef enum eKS_Settings {
/* keyingset cannot be removed (and doesn't need to be freed) */
KEYINGSET_BUILTIN = (1<<0),
/* keyingset does not depend on context info (i.e. paths are absolute) */
KEYINGSET_ABSOLUTE = (1<<1)
KEYINGSET_ABSOLUTE = (1<<1),
} eKS_Settings;
/* Flags for use by keyframe creation/deletion calls */
@@ -989,7 +989,7 @@ typedef enum eAnimData_Flag {
typedef enum eAnimData_Recalc {
ADT_RECALC_DRIVERS = (1 << 0),
ADT_RECALC_ANIM = (1 << 1),
ADT_RECALC_ALL = (ADT_RECALC_DRIVERS | ADT_RECALC_ANIM)
ADT_RECALC_ALL = (ADT_RECALC_DRIVERS | ADT_RECALC_ANIM),
} eAnimData_Recalc;
/* Base Struct for Anim ------------------------------------- */

View File

@@ -152,13 +152,13 @@ typedef enum eArmature_Drawtype {
ARM_LINE = 1,
ARM_B_BONE = 2,
ARM_ENVELOPE = 3,
ARM_WIRE = 4
ARM_WIRE = 4,
} eArmature_Drawtype;
/* armature->gevertdeformer */
typedef enum eArmature_VertDeformer {
ARM_VDEF_BLENDER = 0,
ARM_VDEF_BGE_CPU = 1
ARM_VDEF_BGE_CPU = 1,
} eArmature_VertDeformer;
/* armature->deformflag */
@@ -169,7 +169,7 @@ typedef enum eArmature_DeformFlag {
#ifdef DNA_DEPRECATED
ARM_DEF_B_BONE_REST = (1<<3), /* deprecated */
#endif
ARM_DEF_INVERT_VGROUP = (1<<4)
ARM_DEF_INVERT_VGROUP = (1<<4),
} eArmature_DeformFlag;
/* armature->pathflag */
@@ -180,7 +180,7 @@ typedef enum eArmature_PathFlag {
ARM_PATH_KFRAS = (1<<1),
ARM_PATH_HEADS = (1<<2),
ARM_PATH_ACFRA = (1<<3),
ARM_PATH_KFNOS = (1<<4)
ARM_PATH_KFNOS = (1<<4),
} eArmature_PathFlag;
#endif
@@ -189,7 +189,7 @@ typedef enum eArmature_PathFlag {
typedef enum eArmature_GhostType {
ARM_GHOST_CUR = 0,
ARM_GHOST_RANGE = 1,
ARM_GHOST_KEYS = 2
ARM_GHOST_KEYS = 2,
} eArmature_GhostType;
/* bone->flag */
@@ -239,7 +239,7 @@ typedef enum eBone_Flag {
/** object child will use relative transform (like deform) */
BONE_RELATIVE_PARENTING = (1 << 23),
/** it will add the parent end roll to the inroll */
BONE_ADD_PARENT_END_ROLL = (1 << 24)
BONE_ADD_PARENT_END_ROLL = (1 << 24),
} eBone_Flag;

View File

@@ -215,12 +215,12 @@ typedef enum eBrushFlags {
BRUSH_CUSTOM_ICON = (1 << 28),
BRUSH_LINE = (1 << 29),
BRUSH_ABSOLUTE_JITTER = (1 << 30),
BRUSH_CURVE = (1u << 31)
BRUSH_CURVE = (1u << 31),
} eBrushFlags;
typedef enum {
BRUSH_MASK_PRESSURE_RAMP = (1 << 1),
BRUSH_MASK_PRESSURE_CUTOFF = (1 << 2)
BRUSH_MASK_PRESSURE_CUTOFF = (1 << 2),
} BrushMaskPressureFlags;
/* Brush.overlay_flags */
@@ -230,7 +230,7 @@ typedef enum eOverlayFlags {
BRUSH_OVERLAY_SECONDARY = (1 << 2),
BRUSH_OVERLAY_CURSOR_OVERRIDE_ON_STROKE = (1 << 3),
BRUSH_OVERLAY_PRIMARY_OVERRIDE_ON_STROKE = (1 << 4),
BRUSH_OVERLAY_SECONDARY_OVERRIDE_ON_STROKE = (1 << 5)
BRUSH_OVERLAY_SECONDARY_OVERRIDE_ON_STROKE = (1 << 5),
} eOverlayFlags;
#define BRUSH_OVERLAY_OVERRIDE_MASK (BRUSH_OVERLAY_CURSOR_OVERRIDE_ON_STROKE | \
@@ -257,7 +257,7 @@ typedef enum eBrushSculptTool {
SCULPT_TOOL_CREASE = 16,
SCULPT_TOOL_BLOB = 17,
SCULPT_TOOL_CLAY_STRIPS = 18,
SCULPT_TOOL_MASK = 19
SCULPT_TOOL_MASK = 19,
} eBrushSculptTool;
/** When #BRUSH_ACCUMULATE is used */
@@ -302,7 +302,7 @@ typedef enum eBrushImagePaintTool {
PAINT_TOOL_SMEAR = 2,
PAINT_TOOL_CLONE = 3,
PAINT_TOOL_FILL = 4,
PAINT_TOOL_MASK = 5
PAINT_TOOL_MASK = 5,
} eBrushImagePaintTool;
/* direction that the brush displaces along */
@@ -311,7 +311,7 @@ enum {
SCULPT_DISP_DIR_VIEW = 1,
SCULPT_DISP_DIR_X = 2,
SCULPT_DISP_DIR_Y = 3,
SCULPT_DISP_DIR_Z = 4
SCULPT_DISP_DIR_Z = 4,
};
enum {
@@ -340,7 +340,7 @@ enum {
typedef enum {
BRUSH_MASK_DRAW = 0,
BRUSH_MASK_SMOOTH = 1
BRUSH_MASK_SMOOTH = 1,
} BrushMaskTool;
/* blur kernel types, Brush.blur_mode */

View File

@@ -108,12 +108,12 @@ enum {
HISTO_MODE_R = 2,
HISTO_MODE_G = 3,
HISTO_MODE_B = 4,
HISTO_MODE_ALPHA = 5
HISTO_MODE_ALPHA = 5,
};
enum {
HISTO_FLAG_LINE = (1 << 0),
HISTO_FLAG_SAMPLELINE = (1 << 1)
HISTO_FLAG_SAMPLELINE = (1 << 1),
};
typedef struct Histogram {
@@ -184,7 +184,7 @@ typedef struct ColorManagedColorspaceSettings {
/* ColorManagedViewSettings->flag */
enum {
COLORMANAGE_VIEW_USE_CURVES = (1 << 0)
COLORMANAGE_VIEW_USE_CURVES = (1 << 0),
};
#endif

View File

@@ -99,7 +99,7 @@ typedef struct bConstraintTarget {
/* bConstraintTarget -> flag */
typedef enum eConstraintTargetFlag {
/** temporary target-struct that needs to be freed after use */
CONSTRAINT_TAR_TEMP = (1<<0)
CONSTRAINT_TAR_TEMP = (1<<0),
} eConstraintTargetFlag;
/* bConstraintTarget/bConstraintOb -> type */
@@ -111,7 +111,7 @@ typedef enum eConstraintObType {
/** string is vertex-group name */
CONSTRAINT_OBTYPE_VERT = 3,
/** string is vertex-group name - is not available until curves get vgroups */
CONSTRAINT_OBTYPE_CV = 4
CONSTRAINT_OBTYPE_CV = 4,
} eConstraintObType;
@@ -158,7 +158,7 @@ typedef enum eConstraint_IK_Type {
/** 'standard' IK constraint: match position and/or orientation of target */
CONSTRAINT_IK_COPYPOSE = 0,
/** maintain distance with target */
CONSTRAINT_IK_DISTANCE = 1
CONSTRAINT_IK_DISTANCE = 1,
} eConstraint_IK_Type;
@@ -562,7 +562,7 @@ typedef enum eBConstraint_SpaceTypes {
// XXX deprecated... old AnimSys
typedef enum eConstraintChannel_Flags {
CONSTRAINT_CHANNEL_SELECT = (1<<0),
CONSTRAINT_CHANNEL_PROTECTED = (1<<1)
CONSTRAINT_CHANNEL_PROTECTED = (1<<1),
} eConstraintChannel_Flags;
/* -------------------------------------- */
@@ -575,7 +575,7 @@ typedef enum eCopyRotation_Flags {
ROTLIKE_X_INVERT = (1<<4),
ROTLIKE_Y_INVERT = (1<<5),
ROTLIKE_Z_INVERT = (1<<6),
ROTLIKE_OFFSET = (1<<7)
ROTLIKE_OFFSET = (1<<7),
} eCopyRotation_Flags;
/* bLocateLikeConstraint.flag */
@@ -588,7 +588,7 @@ typedef enum eCopyLocation_Flags {
LOCLIKE_X_INVERT = (1<<4),
LOCLIKE_Y_INVERT = (1<<5),
LOCLIKE_Z_INVERT = (1<<6),
LOCLIKE_OFFSET = (1<<7)
LOCLIKE_OFFSET = (1<<7),
} eCopyLocation_Flags;
/* bSizeLikeConstraint.flag */
@@ -596,7 +596,7 @@ typedef enum eCopyScale_Flags {
SIZELIKE_X = (1<<0),
SIZELIKE_Y = (1<<1),
SIZELIKE_Z = (1<<2),
SIZELIKE_OFFSET = (1<<3)
SIZELIKE_OFFSET = (1<<3),
} eCopyScale_Flags;
/* bTransformConstraint.to/from */
@@ -610,7 +610,7 @@ typedef enum eTransform_ToFrom {
typedef enum eSameVolume_Modes {
SAMEVOL_X = 0,
SAMEVOL_Y = 1,
SAMEVOL_Z = 2
SAMEVOL_Z = 2,
} eSameVolume_Modes;
/* bActionConstraint.flag */
@@ -623,14 +623,14 @@ typedef enum eActionConstraint_Flags {
typedef enum eLockAxis_Modes {
LOCK_X = 0,
LOCK_Y = 1,
LOCK_Z = 2
LOCK_Z = 2,
} eLockAxis_Modes;
/* Up-Axis Values (TrackTo and Locked Track) */
typedef enum eUpAxis_Modes {
UP_X = 0,
UP_Y = 1,
UP_Z = 2
UP_Z = 2,
} eUpAxis_Modes;
/* Tracking axis (TrackTo, Locked Track, Damped Track) and minmax (floor) constraint */
@@ -647,12 +647,12 @@ typedef enum eTrackToAxis_Modes {
typedef enum eFollowPath_Flags {
FOLLOWPATH_FOLLOW = (1<<0),
FOLLOWPATH_STATIC = (1<<1),
FOLLOWPATH_RADIUS = (1<<2)
FOLLOWPATH_RADIUS = (1<<2),
} eFollowPath_Flags;
/* bTrackToConstraint->flags */
typedef enum eTrackTo_Flags {
TARGET_Z_UP = (1<<0)
TARGET_Z_UP = (1<<0),
} eTrackTo_Flags;
/* Stretch To Constraint -> volmode */
@@ -660,14 +660,14 @@ typedef enum eStretchTo_VolMode {
VOLUME_XZ = 0,
VOLUME_X = 1,
VOLUME_Z = 2,
NO_VOLUME = 3
NO_VOLUME = 3,
} eStretchTo_VolMode;
/* Stretch To Constraint -> plane mode */
typedef enum eStretchTo_PlaneMode {
PLANE_X = 0,
PLANE_Y = 1,
PLANE_Z = 2
PLANE_Z = 2,
} eStretchTo_PlaneMode;
/* Clamp-To Constraint ->flag */
@@ -675,12 +675,12 @@ typedef enum eClampTo_Modes {
CLAMPTO_AUTO = 0,
CLAMPTO_X = 1,
CLAMPTO_Y = 2,
CLAMPTO_Z = 3
CLAMPTO_Z = 3,
} eClampTo_Modes;
/* ClampTo Constraint ->flag2 */
typedef enum eClampTo_Flags {
CLAMPTO_CYCLIC = (1<<0)
CLAMPTO_CYCLIC = (1<<0),
} eClampTo_Flags;
/* bKinematicConstraint->flag */
@@ -703,7 +703,7 @@ typedef enum eKinematic_Flags {
CONSTRAINT_IK_NO_ROT_Y = (1<<12),
CONSTRAINT_IK_NO_ROT_Z = (1<<13),
/* axis relative to target */
CONSTRAINT_IK_TARGETAXIS = (1<<14)
CONSTRAINT_IK_TARGETAXIS = (1<<14),
} eKinematic_Flags;
/* bSplineIKConstraint->flag */
@@ -733,14 +733,14 @@ typedef enum eSplineIK_XZScaleModes {
/* x/z scales are the inverse of the y-scale */
CONSTRAINT_SPLINEIK_XZS_INVERSE = 2,
/* x/z scales are computed using a volume preserving technique (from Stretch To constraint) */
CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC = 3
CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC = 3,
} eSplineIK_XZScaleModes;
/* MinMax (floor) flags */
typedef enum eFloor_Flags {
MINMAX_STICKY = (1<<0),
MINMAX_STUCK = (1<<1),
MINMAX_USEROT = (1<<2)
MINMAX_USEROT = (1<<2),
} eFloor_Flags;
/* transform limiting constraints -> flag2 */
@@ -748,7 +748,7 @@ typedef enum eTransformLimits_Flags2 {
/* not used anymore - for older Limit Location constraints only */
LIMIT_NOPARENT = (1<<0),
/* for all Limit constraints - allow to be used during transform? */
LIMIT_TRANSFORM = (1<<1)
LIMIT_TRANSFORM = (1<<1),
} eTransformLimits_Flags2;
/* transform limiting constraints -> flag (own flags) */
@@ -758,14 +758,14 @@ typedef enum eTransformLimits_Flags {
LIMIT_YMIN = (1<<2),
LIMIT_YMAX = (1<<3),
LIMIT_ZMIN = (1<<4),
LIMIT_ZMAX = (1<<5)
LIMIT_ZMAX = (1<<5),
} eTransformLimits_Flags;
/* limit rotation constraint -> flag (own flags) */
typedef enum eRotLimit_Flags {
LIMIT_XROT = (1<<0),
LIMIT_YROT = (1<<1),
LIMIT_ZROT = (1<<2)
LIMIT_ZROT = (1<<2),
} eRotLimit_Flags;
/* distance limit constraint */
@@ -774,20 +774,20 @@ typedef enum eDistLimit_Flag {
/* "soft" cushion effect when reaching the limit sphere */ // NOT IMPLEMENTED!
LIMITDIST_USESOFT = (1<<0),
/* as for all Limit constraints - allow to be used during transform? */
LIMITDIST_TRANSFORM = (1<<1)
LIMITDIST_TRANSFORM = (1<<1),
} eDistLimit_Flag;
/* bDistLimitConstraint->mode */
typedef enum eDistLimit_Modes {
LIMITDIST_INSIDE = 0,
LIMITDIST_OUTSIDE = 1,
LIMITDIST_ONSURFACE = 2
LIMITDIST_ONSURFACE = 2,
} eDistLimit_Modes;
/* python constraint -> flag */
typedef enum ePyConstraint_Flags {
PYCON_USETARGETS = (1<<0),
PYCON_SCRIPTERROR = (1<<1)
PYCON_SCRIPTERROR = (1<<1),
} ePyConstraint_Flags;
/* ChildOf Constraint -> flag */
@@ -801,7 +801,7 @@ typedef enum eChildOf_Flags {
CHILDOF_SIZEX = (1<<6),
CHILDOF_SIZEY = (1<<7),
CHILDOF_SIZEZ = (1<<8),
CHILDOF_ALL = 511
CHILDOF_ALL = 511,
} eChildOf_Flags;
/* Pivot Constraint */
@@ -822,7 +822,7 @@ typedef enum ePivotConstraint_Axis {
/* consider +ve y-axis rotations */
PIVOTCON_AXIS_Y = 4,
/* consider +ve z-axis rotations */
PIVOTCON_AXIS_Z = 5
PIVOTCON_AXIS_Z = 5,
} ePivotConstraint_Axis;
/* settings for Pivot Constraint in general */
@@ -830,29 +830,29 @@ typedef enum ePivotConstraint_Flag {
/* offset is to be interpreted as being a fixed-point in space */
PIVOTCON_FLAG_OFFSET_ABS = (1<<0),
/* rotation-based activation uses negative rotation to drive result */
PIVOTCON_FLAG_ROTACT_NEG = (1<<1)
PIVOTCON_FLAG_ROTACT_NEG = (1<<1),
} ePivotConstraint_Flag;
typedef enum eFollowTrack_Flags {
FOLLOWTRACK_ACTIVECLIP = (1<<0),
FOLLOWTRACK_USE_3D_POSITION = (1<<1),
FOLLOWTRACK_USE_UNDISTORTION = (1<<2)
FOLLOWTRACK_USE_UNDISTORTION = (1<<2),
} eFollowTrack_Flags;
typedef enum eFollowTrack_FrameMethod {
FOLLOWTRACK_FRAME_STRETCH = 0,
FOLLOWTRACK_FRAME_FIT = 1,
FOLLOWTRACK_FRAME_CROP = 2
FOLLOWTRACK_FRAME_CROP = 2,
} eFollowTrack_FrameMethod;
/* CameraSolver Constraint -> flag */
typedef enum eCameraSolver_Flags {
CAMERASOLVER_ACTIVECLIP = (1<<0)
CAMERASOLVER_ACTIVECLIP = (1<<0),
} eCameraSolver_Flags;
/* ObjectSolver Constraint -> flag */
typedef enum eObjectSolver_Flags {
OBJECTSOLVER_ACTIVECLIP = (1<<0)
OBJECTSOLVER_ACTIVECLIP = (1<<0),
} eObjectSolver_Flags;
/* Rigid-Body Constraint */

View File

@@ -401,7 +401,7 @@ typedef enum eBezTriple_Handle {
/* f5 (beztriple) */
typedef enum eBezTriple_Auto_Type {
HD_AUTOTYPE_NORMAL = 0,
HD_AUTOTYPE_SPECIAL = 1
HD_AUTOTYPE_SPECIAL = 1,
} eBezTriple_Auto_Type;
/* interpolation modes (used only for BezTriple->ipo) */

View File

@@ -130,7 +130,7 @@ typedef enum CustomDataType {
CD_TESSLOOPNORMAL = 40,
CD_CUSTOMLOOPNORMAL = 41,
CD_NUMTYPES = 42
CD_NUMTYPES = 42,
} CustomDataType;
/* Bits for CustomDataMask */

View File

@@ -62,7 +62,7 @@ typedef enum eSDNA_Type {
/* define so switch statements don't complain */
#define SDNA_TYPE_VOID 9
SDNA_TYPE_INT64 = 10,
SDNA_TYPE_UINT64 = 11
SDNA_TYPE_UINT64 = 11,
} eSDNA_Type;
/**

View File

@@ -105,7 +105,7 @@ typedef enum eGPDbrush_Flag {
/* brush use random for pressure */
GP_BRUSH_USE_RANDOM_PRESSURE = (1 << 4),
/* brush use random for strength */
GP_BRUSH_USE_RANDOM_STRENGTH = (1 << 5)
GP_BRUSH_USE_RANDOM_STRENGTH = (1 << 5),
} eGPDbrush_Flag;
/* color of palettes */
@@ -131,7 +131,7 @@ typedef enum eGPDpalettecolor_Flag {
/* "volumetric" strokes (i.e. GLU Quadric discs in 3D) */
PC_COLOR_VOLUMETRIC = (1 << 4),
/* Use High quality fill */
PC_COLOR_HQ_FILL = (1 << 5)
PC_COLOR_HQ_FILL = (1 << 5),
} eGPDpalettecolor_Flag;
/* palette of colors */
@@ -149,7 +149,7 @@ typedef struct bGPDpalette {
/* bGPDpalette->flag */
typedef enum eGPDpalette_Flag {
/* palette is active */
PL_PALETTE_ACTIVE = (1 << 0)
A, PL_PALETTE_ACTIVE = (1 << 0)
} eGPDpalette_Flag;
/* Grease-Pencil Annotations - 'Stroke'
@@ -195,7 +195,7 @@ typedef enum eGPDstroke_Flag {
/* Flag used to indicate that stroke is closed and draw edge between last and first point */
GP_STROKE_CYCLIC = (1 << 7),
/* only for use with stroke-buffer (while drawing eraser) */
GP_STROKE_ERASER = (1 << 15)
GP_STROKE_ERASER = (1 << 15),
} eGPDstroke_Flag;
/* Grease-Pencil Annotations - 'Frame'
@@ -217,7 +217,7 @@ typedef enum eGPDframe_Flag {
/* frame is being painted on */
GP_FRAME_PAINT = (1 << 0),
/* for editing in Action Editor */
GP_FRAME_SELECT = (1 << 1)
GP_FRAME_SELECT = (1 << 1),
} eGPDframe_Flag;
/* Grease-Pencil Annotations - 'Layer' */
@@ -342,7 +342,7 @@ typedef enum eGPdata_Flag {
/* Convenience/cache flag to make it easier to quickly toggle onion skinning on/off */
GP_DATA_SHOW_ONIONSKINS = (1 << 9),
/* Draw a green and red point to indicate start and end of the stroke */
GP_DATA_SHOW_DIRECTION = (1 << 10)
GP_DATA_SHOW_DIRECTION = (1 << 10),
} eGPdata_Flag;
#endif /* __DNA_GPENCIL_TYPES_H__ */

View File

@@ -93,7 +93,7 @@ typedef struct RenderSlot {
enum {
TEXTARGET_TEXTURE_2D = 0,
TEXTARGET_TEXTURE_CUBE_MAP = 1,
TEXTARGET_COUNT = 2
TEXTARGET_COUNT = 2,
};
typedef struct Image {

View File

@@ -112,12 +112,12 @@ enum {
KEY_NORMAL = 0,
/* States to blend between (default) */
KEY_RELATIVE = 1
KEY_RELATIVE = 1,
};
/* Key->flag */
enum {
KEY_DS_EXPAND = 1
KEY_DS_EXPAND = 1,
};
/* KeyBlock->type */
@@ -132,7 +132,7 @@ enum {
enum {
KEYBLOCK_MUTE = (1 << 0),
KEYBLOCK_SEL = (1 << 1),
KEYBLOCK_LOCKED = (1 << 2)
KEYBLOCK_LOCKED = (1 << 2),
};
#endif /* __DNA_KEY_TYPES_H__ */

View File

@@ -155,19 +155,19 @@ enum {
enum {
MASK_SPLINE_CYCLIC = (1 << 1),
MASK_SPLINE_NOFILL = (1 << 2),
MASK_SPLINE_NOINTERSECT = (1 << 3)
MASK_SPLINE_NOINTERSECT = (1 << 3),
};
/* MaskSpline->weight_interp */
enum {
MASK_SPLINE_INTERP_LINEAR = 1,
MASK_SPLINE_INTERP_EASE = 2
MASK_SPLINE_INTERP_EASE = 2,
};
/* MaskSpline->offset_mode */
enum {
MASK_SPLINE_OFFSET_EVEN = 0,
MASK_SPLINE_OFFSET_SMOOTH = 1
MASK_SPLINE_OFFSET_SMOOTH = 1,
};
@@ -186,13 +186,13 @@ enum {
MASK_DT_OUTLINE = 0,
MASK_DT_DASH = 1,
MASK_DT_BLACK = 2,
MASK_DT_WHITE = 3
MASK_DT_WHITE = 3,
};
/* MaskSpaceInfo->overlay_mode */
enum {
MASK_OVERLAY_ALPHACHANNEL = 0,
MASK_OVERLAY_COMBINED = 1
MASK_OVERLAY_COMBINED = 1,
};
/* masklay->blend */
@@ -205,12 +205,12 @@ enum {
MASK_BLEND_REPLACE = 5,
MASK_BLEND_DIFFERENCE = 6,
MASK_BLEND_MERGE_ADD = 7,
MASK_BLEND_MERGE_SUBTRACT = 8
MASK_BLEND_MERGE_SUBTRACT = 8,
};
/* masklay->blend_flag */
enum {
MASK_BLENDFLAG_INVERT = (1 << 0)
MASK_BLENDFLAG_INVERT = (1 << 0),
};
/* masklay->flag */
@@ -225,13 +225,13 @@ enum {
/* masklay_shape->flag */
enum {
MASK_SHAPE_SELECT = (1 << 0)
MASK_SHAPE_SELECT = (1 << 0),
};
/* mask->flag */
enum {
MASK_ANIMF_EXPAND = (1 << 4)
MASK_ANIMF_EXPAND = (1 << 4),
};
#endif /* __DNA_MASK_TYPES_H__ */

View File

@@ -126,19 +126,19 @@ enum {
MCLIP_PROXY_UNDISTORTED_SIZE_25 = (1 << 4),
MCLIP_PROXY_UNDISTORTED_SIZE_50 = (1 << 5),
MCLIP_PROXY_UNDISTORTED_SIZE_75 = (1 << 6),
MCLIP_PROXY_UNDISTORTED_SIZE_100 = (1 << 7)
MCLIP_PROXY_UNDISTORTED_SIZE_100 = (1 << 7),
};
/* MovieClip->source */
enum {
MCLIP_SRC_SEQUENCE = 1,
MCLIP_SRC_MOVIE = 2
MCLIP_SRC_MOVIE = 2,
};
/* MovieClip->selection types */
enum {
MCLIP_SEL_NONE = 0,
MCLIP_SEL_TRACK = 1
MCLIP_SEL_TRACK = 1,
};
/* MovieClip->flag */
@@ -148,7 +148,7 @@ enum {
/* MCLIP_CUSTOM_START_FRAME = (1<<2), */ /* UNUSED */
MCLIP_DATA_EXPAND = (1 << 3),
MCLIP_TIMECODE_FLAGS = (MCLIP_USE_PROXY | MCLIP_USE_PROXY_CUSTOM_DIR)
MCLIP_TIMECODE_FLAGS = (MCLIP_USE_PROXY | MCLIP_USE_PROXY_CUSTOM_DIR),
};
/* MovieClip->render_size */
@@ -157,12 +157,12 @@ enum {
MCLIP_PROXY_RENDER_SIZE_25 = 1,
MCLIP_PROXY_RENDER_SIZE_50 = 2,
MCLIP_PROXY_RENDER_SIZE_75 = 3,
MCLIP_PROXY_RENDER_SIZE_100 = 4
MCLIP_PROXY_RENDER_SIZE_100 = 4,
};
/* MovieClip->render_flag */
enum {
MCLIP_PROXY_RENDER_UNDISTORT = 1
MCLIP_PROXY_RENDER_UNDISTORT = 1,
};
#endif

View File

@@ -98,7 +98,7 @@ typedef enum eActStrip_Flag {
ACTSTRIP_CYCLIC_USEX = (1<<8),
ACTSTRIP_CYCLIC_USEY = (1<<9),
ACTSTRIP_CYCLIC_USEZ = (1<<10),
ACTSTRIP_AUTO_BLENDS = (1<<11)
ACTSTRIP_AUTO_BLENDS = (1<<11),
} eActStrip_Flag;
#endif

View File

@@ -141,20 +141,20 @@ typedef enum eNodeSocketDatatype {
SOCK_BOOLEAN = 4,
__SOCK_MESH = 5, /* deprecated */
SOCK_INT = 6,
SOCK_STRING = 7
SOCK_STRING = 7,
} eNodeSocketDatatype;
/* socket shape */
typedef enum eNodeSocketDrawShape {
SOCK_DRAW_SHAPE_CIRCLE = 0,
SOCK_DRAW_SHAPE_SQUARE = 1,
SOCK_DRAW_SHAPE_DIAMOND = 2
SOCK_DRAW_SHAPE_DIAMOND = 2,
} eNodeSocketDrawShape;
/* socket side (input/output) */
typedef enum eNodeSocketInOut {
SOCK_IN = 1,
SOCK_OUT = 2
SOCK_OUT = 2,
} eNodeSocketInOut;
/* sock->flag, first bit is select */
@@ -447,7 +447,7 @@ typedef enum eNodeTreeUpdate {
NTREE_UPDATE_GROUP_IN = (1 << 4), /* group inputs have changed */
NTREE_UPDATE_GROUP_OUT = (1 << 5), /* group outputs have changed */
/* group has changed (generic flag including all other group flags) */
NTREE_UPDATE_GROUP = (NTREE_UPDATE_GROUP_IN | NTREE_UPDATE_GROUP_OUT)
NTREE_UPDATE_GROUP = (NTREE_UPDATE_GROUP_IN | NTREE_UPDATE_GROUP_OUT),
} eNodeTreeUpdate;
@@ -493,25 +493,25 @@ enum {
CMP_NODE_MASKTYPE_ADD = 0,
CMP_NODE_MASKTYPE_SUBTRACT = 1,
CMP_NODE_MASKTYPE_MULTIPLY = 2,
CMP_NODE_MASKTYPE_NOT = 3
CMP_NODE_MASKTYPE_NOT = 3,
};
enum {
CMP_NODE_LENSFLARE_GHOST = (1 << 0),
CMP_NODE_LENSFLARE_GLOW = (1 << 1),
CMP_NODE_LENSFLARE_CIRCLE = (1 << 2),
CMP_NODE_LENSFLARE_STREAKS = (1 << 3)
CMP_NODE_LENSFLARE_STREAKS = (1 << 3),
};
enum {
CMP_NODE_DILATEERODE_STEP = 0,
CMP_NODE_DILATEERODE_DISTANCE_THRESH = 1,
CMP_NODE_DILATEERODE_DISTANCE = 2,
CMP_NODE_DILATEERODE_DISTANCE_FEATHER = 3
CMP_NODE_DILATEERODE_DISTANCE_FEATHER = 3,
};
enum {
CMP_NODE_INPAINT_SIMPLE = 0
CMP_NODE_INPAINT_SIMPLE = 0,
};
enum {
@@ -521,7 +521,7 @@ enum {
/* we may want multiple aspect options, exposed as an rna enum */
CMP_NODEFLAG_MASK_FIXED = (1 << 8),
CMP_NODEFLAG_MASK_FIXED_SCENE = (1 << 9)
CMP_NODEFLAG_MASK_FIXED_SCENE = (1 << 9),
};
enum {

View File

@@ -53,7 +53,7 @@ enum ePF_FileStatus {
PF_REMOVE = 8,
PF_NOOP = 9,
PF_ASK = 10
PF_ASK = 10,
};
#endif /* PACKEDFILE_TYPES_H */

View File

@@ -80,7 +80,7 @@ typedef enum eRigidBodyWorld_Flag {
/* sim data needs to be rebuilt */
RBW_FLAG_NEEDS_REBUILD = (1 << 1),
/* usse split impulse when stepping the simulation */
RBW_FLAG_USE_SPLIT_IMPULSE = (1 << 2)
RBW_FLAG_USE_SPLIT_IMPULSE = (1 << 2),
} eRigidBodyWorld_Flag;
/* ******************************** */
@@ -151,7 +151,7 @@ typedef enum eRigidBodyOb_Flag {
/* collision margin is not embedded (only used by convex hull shapes for now) */
RBO_FLAG_USE_MARGIN = (1 << 6),
/* collision shape deforms during simulation (only for passive triangle mesh shapes) */
RBO_FLAG_USE_DEFORM = (1 << 7)
RBO_FLAG_USE_DEFORM = (1 << 7),
} eRigidBodyOb_Flag;
/* RigidBody Collision Shape */
@@ -313,7 +313,7 @@ typedef enum eRigidBodyCon_Flag {
/* angular springs */
RBC_FLAG_USE_SPRING_ANG_X = (1 << 16),
RBC_FLAG_USE_SPRING_ANG_Y = (1 << 17),
RBC_FLAG_USE_SPRING_ANG_Z = (1 << 18)
RBC_FLAG_USE_SPRING_ANG_Z = (1 << 18),
} eRigidBodyCon_Flag;
/* ******************************** */

View File

@@ -1158,7 +1158,7 @@ typedef struct VPaint {
/* VPaint.flag */
enum {
/* weight paint only */
VP_FLAG_VGROUP_RESTRICT = (1 << 7)
VP_FLAG_VGROUP_RESTRICT = (1 << 7),
};
/* ------------------------------------------- */
@@ -1187,7 +1187,7 @@ typedef enum eGP_Lockaxis_Types {
GP_LOCKAXIS_NONE = 0,
GP_LOCKAXIS_X = 1,
GP_LOCKAXIS_Y = 2,
GP_LOCKAXIS_Z = 3
GP_LOCKAXIS_Z = 3,
} eGP_Lockaxis_Types;
/* Settings for a GPencil Stroke Sculpting Brush */
@@ -1208,7 +1208,7 @@ typedef enum eGP_EditBrush_Flag {
GP_EDITBRUSH_FLAG_USE_FALLOFF = (1 << 2),
/* smooth brush affects pressure values as well */
GP_EDITBRUSH_FLAG_SMOOTH_PRESSURE = (1 << 3)
GP_EDITBRUSH_FLAG_SMOOTH_PRESSURE = (1 << 3),
} eGP_EditBrush_Flag;
@@ -1385,7 +1385,7 @@ typedef enum {
/* only used if unified alpha is enabled, mirrors the brush flag
* BRUSH_ALPHA_PRESSURE */
UNIFIED_PAINT_BRUSH_ALPHA_PRESSURE = (1 << 4)
UNIFIED_PAINT_BRUSH_ALPHA_PRESSURE = (1 << 4),
} eUnifiedPaintSettingsFlags;
@@ -2052,7 +2052,7 @@ extern const char *RE_engine_id_CYCLES;
enum {
OB_DRAW_GROUPUSER_NONE = 0,
OB_DRAW_GROUPUSER_ACTIVE = 1,
OB_DRAW_GROUPUSER_ALL = 2
OB_DRAW_GROUPUSER_ALL = 2,
};
/* object_vgroup.c */
@@ -2062,7 +2062,7 @@ typedef enum eVGroupSelect {
WT_VGROUP_ACTIVE = 1,
WT_VGROUP_BONE_SELECT = 2,
WT_VGROUP_BONE_DEFORM = 3,
WT_VGROUP_BONE_DEFORM_OFF = 4
WT_VGROUP_BONE_DEFORM_OFF = 4,
} eVGroupSelect;
#define WT_VGROUP_MASK_ALL \
@@ -2107,7 +2107,7 @@ typedef enum ePaintFlags {
PAINT_SHOW_BRUSH = (1 << 0),
PAINT_FAST_NAVIGATE = (1 << 1),
PAINT_SHOW_BRUSH_ON_SURFACE = (1 << 2),
PAINT_USE_CAVITY_MASK = (1 << 3)
PAINT_USE_CAVITY_MASK = (1 << 3),
} ePaintFlags;
/* Paint.symmetry_flags
@@ -2221,13 +2221,13 @@ typedef enum eGPencil_Flags {
/* When creating new frames, the last frame gets used as the basis for the new one */
GP_TOOL_FLAG_RETAIN_LAST = (1 << 1),
/* Add the strokes below all strokes in the layer */
GP_TOOL_FLAG_PAINT_ONBACK = (1 << 2)
GP_TOOL_FLAG_PAINT_ONBACK = (1 << 2),
} eGPencil_Flags;
/* ToolSettings.gpencil_src */
typedef enum eGPencil_Source_3D {
GP_TOOL_SOURCE_SCENE = 0,
GP_TOOL_SOURCE_OBJECT = 1
GP_TOOL_SOURCE_OBJECT = 1,
} eGPencil_Source_3d;
/* ToolSettings.gpencil_*_align - Stroke Placement mode flags */

View File

@@ -489,7 +489,7 @@ enum {
/* seq->alpha_mode */
enum {
SEQ_ALPHA_STRAIGHT = 0,
SEQ_ALPHA_PREMUL = 1
SEQ_ALPHA_PREMUL = 1,
};
/* seq->type WATCH IT: SEQ_TYPE_EFFECT BIT is used to determine if this is an effect strip!!! */
@@ -544,7 +544,7 @@ enum {
SEQ_TYPE_DIFFERENCE = 59,
SEQ_TYPE_EXCLUSION = 60,
SEQ_TYPE_MAX = 60
SEQ_TYPE_MAX = 60,
};
#define SEQ_MOVIECLIP_RENDER_UNDISTORTED (1 << 0)
@@ -582,7 +582,7 @@ enum {
enum {
SEQUENCE_MASK_INPUT_STRIP = 0,
SEQUENCE_MASK_INPUT_ID = 1
SEQUENCE_MASK_INPUT_ID = 1,
};
enum {

View File

@@ -108,7 +108,7 @@ typedef enum eSound_Type {
SOUND_TYPE_INVALID = -1,
SOUND_TYPE_FILE = 0,
SOUND_TYPE_BUFFER = 1,
SOUND_TYPE_LIMITER = 2
SOUND_TYPE_LIMITER = 2,
} eSound_Type;
#endif

View File

@@ -609,7 +609,7 @@ typedef enum eSpaceSeq_Proxy_RenderSize {
SEQ_PROXY_RENDER_SIZE_50 = 50,
SEQ_PROXY_RENDER_SIZE_75 = 75,
SEQ_PROXY_RENDER_SIZE_100 = 99,
SEQ_PROXY_RENDER_SIZE_FULL = 100
SEQ_PROXY_RENDER_SIZE_FULL = 100,
} eSpaceSeq_Proxy_RenderSize;
typedef struct MaskSpaceInfo {
@@ -626,7 +626,7 @@ typedef struct MaskSpaceInfo {
typedef enum eSpaceSeq_OverlayType {
SEQ_DRAW_OVERLAY_RECT = 0,
SEQ_DRAW_OVERLAY_REFERENCE = 1,
SEQ_DRAW_OVERLAY_CURRENT = 2
SEQ_DRAW_OVERLAY_CURRENT = 2,
} eSpaceSeq_OverlayType;
/** \} */
@@ -724,7 +724,7 @@ enum eFileDisplayType {
FILE_DEFAULTDISPLAY = 0,
FILE_SHORTDISPLAY = 1,
FILE_LONGDISPLAY = 2,
FILE_IMGDISPLAY = 3
FILE_IMGDISPLAY = 3,
};
/* FileSelectParams.sort */
@@ -733,7 +733,7 @@ enum eFileSortType {
FILE_SORT_ALPHA = 1,
FILE_SORT_EXTENSION = 2,
FILE_SORT_TIME = 3,
FILE_SORT_SIZE = 4
FILE_SORT_SIZE = 4,
};
/* these values need to be hardcoded in structs, dna does not recognize defines */
@@ -1308,7 +1308,7 @@ typedef enum eConsoleLine_Type {
CONSOLE_LINE_OUTPUT = 0,
CONSOLE_LINE_INPUT = 1,
CONSOLE_LINE_INFO = 2, /* autocomp feedback */
CONSOLE_LINE_ERROR = 3
CONSOLE_LINE_ERROR = 3,
} eConsoleLine_Type;

View File

@@ -364,13 +364,13 @@ typedef struct MovieTracking {
/* MovieTrackingCamera->distortion_model */
enum {
TRACKING_DISTORTION_MODEL_POLYNOMIAL = 0,
TRACKING_DISTORTION_MODEL_DIVISION = 1
TRACKING_DISTORTION_MODEL_DIVISION = 1,
};
/* MovieTrackingCamera->units */
enum {
CAMERA_UNITS_PX = 0,
CAMERA_UNITS_MM = 1
CAMERA_UNITS_MM = 1,
};
/* MovieTrackingMarker->flag */
@@ -379,7 +379,7 @@ enum {
MARKER_TRACKED = (1 << 1),
MARKER_GRAPH_SEL_X = (1 << 2),
MARKER_GRAPH_SEL_Y = (1 << 3),
MARKER_GRAPH_SEL = (MARKER_GRAPH_SEL_X | MARKER_GRAPH_SEL_Y)
MARKER_GRAPH_SEL = (MARKER_GRAPH_SEL_X | MARKER_GRAPH_SEL_Y),
};
/* MovieTrackingTrack->flag */
@@ -395,7 +395,7 @@ enum {
TRACK_PREVIEW_GRAYSCALE = (1 << 9),
TRACK_DOPE_SEL = (1 << 10),
TRACK_PREVIEW_ALPHA = (1 << 11),
TRACK_USE_2D_STAB_ROT = (1 << 12)
TRACK_USE_2D_STAB_ROT = (1 << 12),
};
/* MovieTrackingTrack->motion_model */
@@ -405,33 +405,33 @@ enum {
TRACK_MOTION_MODEL_TRANSLATION_SCALE = 2,
TRACK_MOTION_MODEL_TRANSLATION_ROTATION_SCALE = 3,
TRACK_MOTION_MODEL_AFFINE = 4,
TRACK_MOTION_MODEL_HOMOGRAPHY = 5
TRACK_MOTION_MODEL_HOMOGRAPHY = 5,
};
/* MovieTrackingTrack->algorithm_flag */
enum {
TRACK_ALGORITHM_FLAG_USE_BRUTE = (1 << 0),
TRACK_ALGORITHM_FLAG_USE_NORMALIZATION = (1 << 2),
TRACK_ALGORITHM_FLAG_USE_MASK = (1 << 3)
TRACK_ALGORITHM_FLAG_USE_MASK = (1 << 3),
};
/* MovieTrackingTrack->adjframes */
enum {
TRACK_MATCH_KEYFRAME = 0,
TRACK_MATCH_PREVFRAME = 1
TRACK_MATCH_PREVFRAME = 1,
};
/* MovieTrackingSettings->flag */
enum {
TRACKING_SETTINGS_SHOW_DEFAULT_EXPANDED = (1 << 0),
TRACKING_SETTINGS_SHOW_EXTRA_EXPANDED = (1 << 1)
TRACKING_SETTINGS_SHOW_EXTRA_EXPANDED = (1 << 1),
};
/* MovieTrackingSettings->motion_flag */
enum {
TRACKING_MOTION_TRIPOD = (1 << 0),
TRACKING_MOTION_MODAL = (TRACKING_MOTION_TRIPOD)
TRACKING_MOTION_MODAL = (TRACKING_MOTION_TRIPOD),
};
/* MovieTrackingSettings->speed */
@@ -440,13 +440,13 @@ enum {
TRACKING_SPEED_REALTIME = 1,
TRACKING_SPEED_HALF = 2,
TRACKING_SPEED_QUARTER = 4,
TRACKING_SPEED_DOUBLE = 5
TRACKING_SPEED_DOUBLE = 5,
};
/* MovieTrackingSettings->reconstruction_flag */
enum {
/* TRACKING_USE_FALLBACK_RECONSTRUCTION = (1 << 0), */ /* DEPRECATED */
TRACKING_USE_KEYFRAME_SELECTION = (1 << 1)
TRACKING_USE_KEYFRAME_SELECTION = (1 << 1),
};
/* MovieTrackingSettings->refine_camera_intrinsics */
@@ -454,7 +454,7 @@ enum {
REFINE_FOCAL_LENGTH = (1 << 0),
REFINE_PRINCIPAL_POINT = (1 << 1),
REFINE_RADIAL_DISTORTION_K1 = (1 << 2),
REFINE_RADIAL_DISTORTION_K2 = (1 << 4)
REFINE_RADIAL_DISTORTION_K2 = (1 << 4),
};
/* MovieTrackingStrabilization->flag */
@@ -463,30 +463,30 @@ enum {
TRACKING_AUTOSCALE = (1 << 1),
TRACKING_STABILIZE_ROTATION = (1 << 2),
TRACKING_STABILIZE_SCALE = (1 << 3),
TRACKING_SHOW_STAB_TRACKS = (1 << 5)
TRACKING_SHOW_STAB_TRACKS = (1 << 5),
};
/* MovieTrackingStrabilization->filter */
enum {
TRACKING_FILTER_NEAREST = 0,
TRACKING_FILTER_BILINEAR = 1,
TRACKING_FILTER_BICUBIC = 2
TRACKING_FILTER_BICUBIC = 2,
};
/* MovieTrackingReconstruction->flag */
enum {
TRACKING_RECONSTRUCTED = (1 << 0)
TRACKING_RECONSTRUCTED = (1 << 0),
};
/* MovieTrackingObject->flag */
enum {
TRACKING_OBJECT_CAMERA = (1 << 0)
TRACKING_OBJECT_CAMERA = (1 << 0),
};
enum {
TRACKING_CLEAN_SELECT = 0,
TRACKING_CLEAN_DELETE_TRACK = 1,
TRACKING_CLEAN_DELETE_SEGMENT = 2
TRACKING_CLEAN_DELETE_SEGMENT = 2,
};
/* MovieTrackingDopesheet->sort_method */
@@ -494,21 +494,21 @@ enum {
TRACKING_DOPE_SORT_NAME = 0,
TRACKING_DOPE_SORT_LONGEST = 1,
TRACKING_DOPE_SORT_TOTAL = 2,
TRACKING_DOPE_SORT_AVERAGE_ERROR = 3
TRACKING_DOPE_SORT_AVERAGE_ERROR = 3,
};
/* MovieTrackingDopesheet->flag */
enum {
TRACKING_DOPE_SORT_INVERSE = (1 << 0),
TRACKING_DOPE_SELECTED_ONLY = (1 << 1),
TRACKING_DOPE_SHOW_HIDDEN = (1 << 2)
TRACKING_DOPE_SHOW_HIDDEN = (1 << 2),
};
/* MovieTrackingDopesheetCoverageSegment->trackness */
enum {
TRACKING_COVERAGE_BAD = 0,
TRACKING_COVERAGE_ACCEPTABLE = 1,
TRACKING_COVERAGE_OK = 2
TRACKING_COVERAGE_OK = 2,
};
/* MovieTrackingPlaneMarker->flag */

View File

@@ -56,7 +56,7 @@ typedef enum eUIFont_ID {
/* free slots */
UIFONT_CUSTOM1 = 2,
UIFONT_CUSTOM2 = 3
UIFONT_CUSTOM2 = 3,
} eUIFont_ID;
/* default fonts to load/initialize */
@@ -89,7 +89,7 @@ typedef struct uiFontStyle {
typedef enum eFontStyle_Align {
UI_STYLE_TEXT_LEFT = 0,
UI_STYLE_TEXT_CENTER = 1,
UI_STYLE_TEXT_RIGHT = 2
UI_STYLE_TEXT_RIGHT = 2,
} eFontStyle_Align;
@@ -647,7 +647,7 @@ typedef enum ePathCompare_Flag {
typedef enum eViewZoom_Style {
USER_ZOOM_CONT = 0,
USER_ZOOM_SCALE = 1,
USER_ZOOM_DOLLY = 2
USER_ZOOM_DOLLY = 2,
} eViewZoom_Style;
/* UserDef.navigation_mode */
@@ -696,7 +696,7 @@ typedef enum eUserpref_UI_Flag {
USER_HIDE_RECENT = (1 << 28),
USER_SHOW_THUMBNAILS = (1 << 29),
USER_QUIT_PROMPT = (1 << 30),
USER_HIDE_SYSTEM_BOOKMARKS = (1u << 31)
USER_HIDE_SYSTEM_BOOKMARKS = (1u << 31),
} eUserpref_UI_Flag;
/* UserDef.uiflag2 */
@@ -721,7 +721,7 @@ typedef enum eAutokey_Mode {
/** AUTOKEY_ON + 2**n... (i.e. AUTOKEY_MODE_NORMAL = AUTOKEY_ON + 2)
* to preserve setting, even when autokey turned off */
AUTOKEY_MODE_NORMAL = 3,
AUTOKEY_MODE_EDITKEYS = 5
AUTOKEY_MODE_EDITKEYS = 5,
} eAutokey_Mode;
/* Zoom to frame mode.
@@ -729,7 +729,7 @@ typedef enum eAutokey_Mode {
typedef enum eZoomFrame_Mode {
ZOOM_FRAME_MODE_KEEP_RANGE = 0,
ZOOM_FRAME_MODE_SECONDS = 1,
ZOOM_FRAME_MODE_KEYFRAMES = 2
ZOOM_FRAME_MODE_KEYFRAMES = 2,
} eZoomFrame_Mode;
/* Auto-Keying flag
@@ -774,7 +774,7 @@ typedef enum eDupli_ID_Flags {
USER_DUP_TEX = (1 << 8),
USER_DUP_ARM = (1 << 9),
USER_DUP_ACT = (1 << 10),
USER_DUP_PSYS = (1 << 11)
USER_DUP_PSYS = (1 << 11),
} eDupli_ID_Flags;
/* UserDef.gameflags */
@@ -790,7 +790,7 @@ typedef enum eOpenGL_RenderingOptions {
typedef enum eOpenGL_SelectOptions {
USER_SELECT_AUTO = 0,
USER_SELECT_USE_OCCLUSION_QUERY = 1,
USER_SELECT_USE_SELECT_RENDERMODE = 2
USER_SELECT_USE_SELECT_RENDERMODE = 2,
} eOpenGL_SelectOptions;
/* wm draw method.
@@ -865,7 +865,7 @@ typedef enum eTheme_DrawTypes {
TH_ROUNDSHADED = 1,
TH_ROUNDED = 2,
TH_OLDSKOOL = 3,
TH_SHADED = 4
TH_SHADED = 4,
} eTheme_DrawTypes;
/* UserDef.ndof_flag (3D mouse options) */

View File

@@ -92,7 +92,7 @@ typedef enum {
CAP_START = 1,
CAP_END = 2,
SEAM_FRAME = 4,
ROOT = 8
ROOT = 8,
} SkinNodeFlag;
typedef struct Frame {

View File

@@ -379,7 +379,7 @@ bool RE_allow_render_generic_object(struct Object *ob);
/* RE_updateRenderInstances flag */
enum {
RE_OBJECT_INSTANCES_UPDATE_VIEW = (1 << 0),
RE_OBJECT_INSTANCES_UPDATE_OBMAT = (1 << 1)
RE_OBJECT_INSTANCES_UPDATE_OBMAT = (1 << 1),
};
void RE_updateRenderInstances(Render *re, int flag);

View File

@@ -119,7 +119,7 @@ enum {
PART_STATUS_NONE = 0,
PART_STATUS_IN_PROGRESS = 1,
PART_STATUS_RENDERED = 2,
PART_STATUS_MERGED = 3
PART_STATUS_MERGED = 3,
};
/* controls state of render, everything that's read-only during render stage */

View File

@@ -448,7 +448,7 @@ enum {
WM_JOB_PRIORITY = (1 << 0),
WM_JOB_EXCL_RENDER = (1 << 1),
WM_JOB_PROGRESS = (1 << 2),
WM_JOB_SUSPEND = (1 << 3)
WM_JOB_SUSPEND = (1 << 3),
};
/* identifying jobs by owner alone is unreliable, this isnt saved, order can change (keep 0 for 'any') */

Some files were not shown because too many files have changed in this diff Show More