From fb278a501e2c64f4ecba541545465975eebb8dcc Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 15 Jun 2012 14:11:05 +0000 Subject: Ensure enums in DNA files has got explicit values See http://wiki.blender.org/index.php/Dev:Doc/CodeStyle#Macros.2C_Enums.2C_Inline_functions --- source/blender/makesdna/DNA_ID.h | 4 +- source/blender/makesdna/DNA_action_types.h | 2 +- source/blender/makesdna/DNA_anim_types.h | 30 ++--- source/blender/makesdna/DNA_armature_types.h | 16 +-- source/blender/makesdna/DNA_boid_types.h | 56 ++++----- source/blender/makesdna/DNA_brush_types.h | 28 ++--- source/blender/makesdna/DNA_color_types.h | 14 +-- source/blender/makesdna/DNA_constraint_types.h | 136 ++++++++++----------- source/blender/makesdna/DNA_curve_types.h | 20 +-- source/blender/makesdna/DNA_mask_types.h | 6 +- source/blender/makesdna/DNA_modifier_types.h | 110 ++++++++--------- source/blender/makesdna/DNA_object_force.h | 28 ++--- source/blender/makesdna/DNA_packedFile_types.h | 20 +-- source/blender/makesdna/DNA_screen_types.h | 14 +-- source/blender/makesdna/DNA_sound_types.h | 4 +- source/blender/makesdna/DNA_space_types.h | 162 ++++++++++++------------- source/blender/makesdna/DNA_tracking_types.h | 2 +- 17 files changed, 326 insertions(+), 326 deletions(-) (limited to 'source') diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index b6fc4f58bd7..95eadc23ef4 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -139,8 +139,8 @@ typedef struct Library { } Library; enum eIconSizes { - ICON_SIZE_ICON, - ICON_SIZE_PREVIEW + ICON_SIZE_ICON = 0, + ICON_SIZE_PREVIEW = 1 }; #define NUM_ICON_SIZES (ICON_SIZE_PREVIEW + 1) diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 08d5743bb88..ea012090bbd 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -373,7 +373,7 @@ typedef enum ePose_Flags { /* bPose->iksolver and bPose->ikparam->iksolver */ typedef enum ePose_IKSolverType { IKSOLVER_LEGACY = 0, - IKSOLVER_ITASC + IKSOLVER_ITASC = 1 } ePose_IKSolverType; /* header for all bPose->ikparam structures */ diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index fd4b86a4155..55fb3322806 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -72,15 +72,15 @@ typedef struct FModifier { */ typedef enum eFModifier_Types { FMODIFIER_TYPE_NULL = 0, - FMODIFIER_TYPE_GENERATOR, - FMODIFIER_TYPE_FN_GENERATOR, - FMODIFIER_TYPE_ENVELOPE, - FMODIFIER_TYPE_CYCLES, - FMODIFIER_TYPE_NOISE, - FMODIFIER_TYPE_FILTER, /* unimplemented - for applying: fft, high/low pass filters, etc. */ - FMODIFIER_TYPE_PYTHON, - FMODIFIER_TYPE_LIMITS, - FMODIFIER_TYPE_STEPPED, + FMODIFIER_TYPE_GENERATOR = 1, + FMODIFIER_TYPE_FN_GENERATOR = 2, + FMODIFIER_TYPE_ENVELOPE = 3, + FMODIFIER_TYPE_CYCLES = 4, + FMODIFIER_TYPE_NOISE = 5, + FMODIFIER_TYPE_FILTER = 6, /* unimplemented - for applying: fft, high/low pass filters, etc. */ + FMODIFIER_TYPE_PYTHON = 7, + FMODIFIER_TYPE_LIMITS = 8, + FMODIFIER_TYPE_STEPPED = 9, /* NOTE: all new modifiers must be added above this line */ FMODIFIER_NUM_TYPES @@ -120,7 +120,7 @@ typedef struct FMod_Generator { /* generator modes */ typedef enum eFMod_Generator_Modes { FCM_GENERATOR_POLYNOMIAL = 0, - FCM_GENERATOR_POLYNOMIAL_FACTORISED + FCM_GENERATOR_POLYNOMIAL_FACTORISED = 1 } eFMod_Generator_Modes; @@ -156,11 +156,11 @@ typedef struct FMod_FunctionGenerator { /* 'function' generator types */ typedef enum eFMod_Generator_Functions { FCM_GENERATOR_FN_SIN = 0, - FCM_GENERATOR_FN_COS, - FCM_GENERATOR_FN_TAN, - FCM_GENERATOR_FN_SQRT, - FCM_GENERATOR_FN_LN, - FCM_GENERATOR_FN_SINC + FCM_GENERATOR_FN_COS = 1, + FCM_GENERATOR_FN_TAN = 2, + FCM_GENERATOR_FN_SQRT = 3, + FCM_GENERATOR_FN_LN = 4, + FCM_GENERATOR_FN_SINC = 5 } eFMod_Generator_Functions; diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index 7faeccd2a32..cc08d0e92bd 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -135,16 +135,16 @@ typedef enum eArmature_Flag { /* armature->drawtype */ typedef enum eArmature_Drawtype { ARM_OCTA = 0, - ARM_LINE, - ARM_B_BONE, - ARM_ENVELOPE, - ARM_WIRE + ARM_LINE = 1, + ARM_B_BONE = 2, + ARM_ENVELOPE = 3, + ARM_WIRE = 4 } eArmature_Drawtype; /* armature->gevertdeformer */ typedef enum eArmature_VertDeformer { - ARM_VDEF_BLENDER, - ARM_VDEF_BGE_CPU + ARM_VDEF_BLENDER = 0, + ARM_VDEF_BGE_CPU = 1 } eArmature_VertDeformer; /* armature->deformflag */ @@ -170,8 +170,8 @@ typedef enum eArmature_PathFlag { // XXX depreceated... old animation system (armature only viz) typedef enum eArmature_GhostType { ARM_GHOST_CUR = 0, - ARM_GHOST_RANGE, - ARM_GHOST_KEYS + ARM_GHOST_RANGE = 1, + ARM_GHOST_KEYS = 2 } eArmature_GhostType; /* bone->flag */ diff --git a/source/blender/makesdna/DNA_boid_types.h b/source/blender/makesdna/DNA_boid_types.h index 698667ff33c..ce5fc4b0c3c 100644 --- a/source/blender/makesdna/DNA_boid_types.h +++ b/source/blender/makesdna/DNA_boid_types.h @@ -36,18 +36,18 @@ typedef enum BoidRuleType { eBoidRuleType_None = 0, - eBoidRuleType_Goal, /* go to goal assigned object or loudest assigned signal source */ - eBoidRuleType_Avoid, /* get away from assigned object or loudest assigned signal source */ - eBoidRuleType_AvoidCollision, /* manoeuver to avoid collisions with other boids and deflector object in near future */ - eBoidRuleType_Separate, /* keep from going through other boids */ - eBoidRuleType_Flock, /* move to center of neighbors and match their velocity */ - eBoidRuleType_FollowLeader, /* follow a boid or assigned object */ - eBoidRuleType_AverageSpeed, /* maintain speed, flight level or wander*/ - eBoidRuleType_Fight, /* go to closest enemy and attack when in range */ - //eBoidRuleType_Protect, /* go to enemy closest to target and attack when in range */ - //eBoidRuleType_Hide, /* find a deflector move to it's other side from closest enemy */ - //eBoidRuleType_FollowPath, /* move along a assigned curve or closest curve in a group */ - //eBoidRuleType_FollowWall, /* move next to a deflector object's in direction of it's tangent */ + eBoidRuleType_Goal = 1, /* go to goal assigned object or loudest assigned signal source */ + eBoidRuleType_Avoid = 2, /* get away from assigned object or loudest assigned signal source */ + eBoidRuleType_AvoidCollision = 3, /* manoeuver to avoid collisions with other boids and deflector object in near future */ + eBoidRuleType_Separate = 4, /* keep from going through other boids */ + eBoidRuleType_Flock = 5, /* move to center of neighbors and match their velocity */ + eBoidRuleType_FollowLeader = 6, /* follow a boid or assigned object */ + eBoidRuleType_AverageSpeed = 7, /* maintain speed, flight level or wander*/ + eBoidRuleType_Fight = 8, /* go to closest enemy and attack when in range */ + //eBoidRuleType_Protect = 9, /* go to enemy closest to target and attack when in range */ + //eBoidRuleType_Hide = 10, /* find a deflector move to it's other side from closest enemy */ + //eBoidRuleType_FollowPath = 11, /* move along a assigned curve or closest curve in a group */ + //eBoidRuleType_FollowWall = 12, /* move next to a deflector object's in direction of it's tangent */ NUM_BOID_RULE_TYPES } BoidRuleType; @@ -98,10 +98,10 @@ typedef struct BoidRuleFight { typedef enum BoidMode { eBoidMode_InAir = 0, - eBoidMode_OnLand, - eBoidMode_Climbing, - eBoidMode_Falling, - eBoidMode_Liftoff, + eBoidMode_OnLand = 1, + eBoidMode_Climbing = 2, + eBoidMode_Falling = 3, + eBoidMode_Liftoff = 4, NUM_BOID_MODES } BoidMode; @@ -114,20 +114,20 @@ typedef struct BoidData { // planned for near future //typedef enum BoidConditionMode { // eBoidConditionType_Then = 0, -// eBoidConditionType_And, -// eBoidConditionType_Or, +// eBoidConditionType_And = 1, +// eBoidConditionType_Or = 2, // NUM_BOID_CONDITION_MODES //} BoidConditionMode; //typedef enum BoidConditionType { // eBoidConditionType_None = 0, -// eBoidConditionType_Signal, -// eBoidConditionType_NoSignal, -// eBoidConditionType_HealthBelow, -// eBoidConditionType_HealthAbove, -// eBoidConditionType_See, -// eBoidConditionType_NotSee, -// eBoidConditionType_StateTime, -// eBoidConditionType_Touching, +// eBoidConditionType_Signal = 1, +// eBoidConditionType_NoSignal = 2, +// eBoidConditionType_HealthBelow = 3, +// eBoidConditionType_HealthAbove = 4, +// eBoidConditionType_See = 5, +// eBoidConditionType_NotSee = 6, +// eBoidConditionType_StateTime = 7, +// eBoidConditionType_Touching = 8, // NUM_BOID_CONDITION_TYPES //} BoidConditionType; //typedef struct BoidCondition { @@ -142,8 +142,8 @@ typedef struct BoidData { typedef enum BoidRulesetType { eBoidRulesetType_Fuzzy = 0, - eBoidRulesetType_Random, - eBoidRulesetType_Average, + eBoidRulesetType_Random = 1, + eBoidRulesetType_Average = 2, NUM_BOID_RULESET_TYPES } BoidRulesetType; #define BOIDSTATE_CURRENT 1 diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 0cef9aa03b7..cc26ee479d7 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -174,26 +174,26 @@ typedef enum BrushSculptTool { /* direction that the brush displaces along */ enum { - SCULPT_DISP_DIR_AREA, - SCULPT_DISP_DIR_VIEW, - SCULPT_DISP_DIR_X, - SCULPT_DISP_DIR_Y, - SCULPT_DISP_DIR_Z + SCULPT_DISP_DIR_AREA = 0, + SCULPT_DISP_DIR_VIEW = 1, + SCULPT_DISP_DIR_X = 2, + SCULPT_DISP_DIR_Y = 3, + SCULPT_DISP_DIR_Z = 4 }; enum { - PAINT_BLEND_MIX, - PAINT_BLEND_ADD, - PAINT_BLEND_SUB, - PAINT_BLEND_MUL, - PAINT_BLEND_BLUR, - PAINT_BLEND_LIGHTEN, - PAINT_BLEND_DARKEN + PAINT_BLEND_MIX = 0, + PAINT_BLEND_ADD = 1, + PAINT_BLEND_SUB = 2, + PAINT_BLEND_MUL = 3, + PAINT_BLEND_BLUR = 4, + PAINT_BLEND_LIGHTEN = 5, + PAINT_BLEND_DARKEN = 6 }; typedef enum { - BRUSH_MASK_DRAW, - BRUSH_MASK_SMOOTH + BRUSH_MASK_DRAW = 0, + BRUSH_MASK_SMOOTH = 1 } BrushMaskTool; #define MAX_BRUSH_PIXEL_RADIUS 200 diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h index 99e2a123fe7..1f8fdd20dda 100644 --- a/source/blender/makesdna/DNA_color_types.h +++ b/source/blender/makesdna/DNA_color_types.h @@ -86,13 +86,13 @@ typedef struct CurveMapping { /* cumapping->preset */ typedef enum CurveMappingPreset { - CURVE_PRESET_LINE, - CURVE_PRESET_SHARP, - CURVE_PRESET_SMOOTH, - CURVE_PRESET_MAX, - CURVE_PRESET_MID9, - CURVE_PRESET_ROUND, - CURVE_PRESET_ROOT, + CURVE_PRESET_LINE = 0, + CURVE_PRESET_SHARP = 1, + CURVE_PRESET_SMOOTH = 2, + CURVE_PRESET_MAX = 3, + CURVE_PRESET_MID9 = 4, + CURVE_PRESET_ROUND = 5, + CURVE_PRESET_ROOT = 6, } CurveMappingPreset; /* histogram->mode */ diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index 6ca9a95400d..40362424532 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -104,9 +104,9 @@ typedef enum B_CONSTRAINT_TARGET_FLAG { /* bConstraintTarget/bConstraintOb -> type */ typedef enum B_CONSTRAINT_OB_TYPE { CONSTRAINT_OBTYPE_OBJECT = 1, /* string is "" */ - CONSTRAINT_OBTYPE_BONE, /* string is bone-name */ - CONSTRAINT_OBTYPE_VERT, /* string is vertex-group name */ - CONSTRAINT_OBTYPE_CV /* string is vertex-group name - is not available until curves get vgroups */ + CONSTRAINT_OBTYPE_BONE = 2, /* string is bone-name */ + CONSTRAINT_OBTYPE_VERT = 3, /* string is vertex-group name */ + CONSTRAINT_OBTYPE_CV = 4 /* string is vertex-group name - is not available until curves get vgroups */ } B_CONSTRAINT_OB_TYPE; @@ -152,7 +152,7 @@ typedef struct bKinematicConstraint { typedef enum B_CONSTRAINT_IK_TYPE { CONSTRAINT_IK_COPYPOSE = 0, /* 'standard' IK constraint: match position and/or orientation of target */ - CONSTRAINT_IK_DISTANCE /* maintain distance with target */ + CONSTRAINT_IK_DISTANCE = 1 /* maintain distance with target */ } B_CONSTRAINT_IK_TYPE; @@ -444,34 +444,34 @@ typedef struct bObjectSolverConstraint { */ typedef enum eBConstraint_Types { CONSTRAINT_TYPE_NULL = 0, /* Invalid/legacy constraint */ - CONSTRAINT_TYPE_CHILDOF, /* Unimplemented non longer :) - during constraints recode, Aligorith */ - CONSTRAINT_TYPE_TRACKTO, - CONSTRAINT_TYPE_KINEMATIC, - CONSTRAINT_TYPE_FOLLOWPATH, - CONSTRAINT_TYPE_ROTLIMIT, /* Unimplemented no longer :) - Aligorith */ - CONSTRAINT_TYPE_LOCLIMIT, /* Unimplemented no longer :) - Aligorith */ - CONSTRAINT_TYPE_SIZELIMIT, /* Unimplemented no longer :) - Aligorith */ - CONSTRAINT_TYPE_ROTLIKE, - CONSTRAINT_TYPE_LOCLIKE, - CONSTRAINT_TYPE_SIZELIKE, - CONSTRAINT_TYPE_PYTHON, /* Unimplemented no longer :) - Aligorith. Scripts */ - CONSTRAINT_TYPE_ACTION, - CONSTRAINT_TYPE_LOCKTRACK, /* New Tracking constraint that locks an axis in place - theeth */ - CONSTRAINT_TYPE_DISTLIMIT, /* limit distance */ - CONSTRAINT_TYPE_STRETCHTO, /* claiming this to be mine :) is in tuhopuu bjornmose */ - CONSTRAINT_TYPE_MINMAX, /* floor constraint */ - CONSTRAINT_TYPE_RIGIDBODYJOINT, /* rigidbody constraint */ - CONSTRAINT_TYPE_CLAMPTO, /* clampto constraint */ - CONSTRAINT_TYPE_TRANSFORM, /* transformation (loc/rot/size -> loc/rot/size) constraint */ - CONSTRAINT_TYPE_SHRINKWRAP, /* shrinkwrap (loc/rot) constraint */ - CONSTRAINT_TYPE_DAMPTRACK, /* New Tracking constraint that minimises twisting */ - CONSTRAINT_TYPE_SPLINEIK, /* Spline-IK - Align 'n' bones to a curve */ - CONSTRAINT_TYPE_TRANSLIKE, /* Copy transform matrix */ - CONSTRAINT_TYPE_SAMEVOL, /* Maintain volume during scaling */ - CONSTRAINT_TYPE_PIVOT, /* Pivot Constraint */ - CONSTRAINT_TYPE_FOLLOWTRACK, /* Follow Track Constraint */ - CONSTRAINT_TYPE_CAMERASOLVER, /* Camera Solver Constraint */ - CONSTRAINT_TYPE_OBJECTSOLVER, /* Object Solver Constraint */ + CONSTRAINT_TYPE_CHILDOF = 1, /* Unimplemented non longer :) - during constraints recode, Aligorith */ + CONSTRAINT_TYPE_TRACKTO = 2, + CONSTRAINT_TYPE_KINEMATIC = 3, + CONSTRAINT_TYPE_FOLLOWPATH = 4, + CONSTRAINT_TYPE_ROTLIMIT = 5, /* Unimplemented no longer :) - Aligorith */ + CONSTRAINT_TYPE_LOCLIMIT = 6, /* Unimplemented no longer :) - Aligorith */ + CONSTRAINT_TYPE_SIZELIMIT = 7, /* Unimplemented no longer :) - Aligorith */ + CONSTRAINT_TYPE_ROTLIKE = 8, + CONSTRAINT_TYPE_LOCLIKE = 9, + CONSTRAINT_TYPE_SIZELIKE = 10, + CONSTRAINT_TYPE_PYTHON = 11, /* Unimplemented no longer :) - Aligorith. Scripts */ + CONSTRAINT_TYPE_ACTION = 12, + CONSTRAINT_TYPE_LOCKTRACK = 13, /* New Tracking constraint that locks an axis in place - theeth */ + CONSTRAINT_TYPE_DISTLIMIT = 14, /* limit distance */ + CONSTRAINT_TYPE_STRETCHTO = 15, /* claiming this to be mine :) is in tuhopuu bjornmose */ + CONSTRAINT_TYPE_MINMAX = 16, /* floor constraint */ + CONSTRAINT_TYPE_RIGIDBODYJOINT = 17, /* rigidbody constraint */ + CONSTRAINT_TYPE_CLAMPTO = 18, /* clampto constraint */ + CONSTRAINT_TYPE_TRANSFORM = 19, /* transformation (loc/rot/size -> loc/rot/size) constraint */ + CONSTRAINT_TYPE_SHRINKWRAP = 20, /* shrinkwrap (loc/rot) constraint */ + CONSTRAINT_TYPE_DAMPTRACK = 21, /* New Tracking constraint that minimises twisting */ + CONSTRAINT_TYPE_SPLINEIK = 22, /* Spline-IK - Align 'n' bones to a curve */ + CONSTRAINT_TYPE_TRANSLIKE = 23, /* Copy transform matrix */ + CONSTRAINT_TYPE_SAMEVOL = 24, /* Maintain volume during scaling */ + CONSTRAINT_TYPE_PIVOT = 25, /* Pivot Constraint */ + CONSTRAINT_TYPE_FOLLOWTRACK = 26, /* Follow Track Constraint */ + CONSTRAINT_TYPE_CAMERASOLVER = 27, /* Camera Solver Constraint */ + CONSTRAINT_TYPE_OBJECTSOLVER = 28, /* Object Solver Constraint */ /* NOTE: no constraints are allowed to be added after this */ NUM_CONSTRAINT_TYPES @@ -504,13 +504,13 @@ typedef enum eBConstraint_SpaceTypes { /* for objects (relative to parent/without parent influence), * for bones (along normals of bone, without parent/restpositions) */ - CONSTRAINT_SPACE_LOCAL, /* = 1 */ + CONSTRAINT_SPACE_LOCAL = 1, /* for posechannels - pose space */ - CONSTRAINT_SPACE_POSE, /* = 2 */ + CONSTRAINT_SPACE_POSE = 2, /* for posechannels - local with parent */ - CONSTRAINT_SPACE_PARLOCAL, /* = 3 */ + CONSTRAINT_SPACE_PARLOCAL = 3, /* for files from between 2.43-2.46 (should have been parlocal) */ - CONSTRAINT_SPACE_INVALID /* = 4. do not exchange for anything! */ + CONSTRAINT_SPACE_INVALID = 4 /* do not exchange for anything! */ } eBConstraint_SpaceTypes; /* bConstraintChannel.flag */ @@ -557,8 +557,8 @@ typedef enum eCopyScale_Flags { /* bSameVolumeConstraint.flag */ typedef enum eSameVolume_Modes { SAMEVOL_X = 0, - SAMEVOL_Y, - SAMEVOL_Z + SAMEVOL_Y = 1, + SAMEVOL_Z = 2 } eSameVolume_Modes; /* bActionConstraint.flag */ @@ -569,26 +569,26 @@ typedef enum eActionConstraint_Flags { /* Locked-Axis Values (Locked Track) */ typedef enum eLockAxis_Modes { - LOCK_X = 0, - LOCK_Y, - LOCK_Z + LOCK_X = 0, + LOCK_Y = 1, + LOCK_Z = 2 } eLockAxis_Modes; /* Up-Axis Values (TrackTo and Locked Track) */ typedef enum eUpAxis_Modes { - UP_X = 0, - UP_Y, - UP_Z + UP_X = 0, + UP_Y = 1, + UP_Z = 2 } eUpAxis_Modes; /* Tracking axis (TrackTo, Locked Track, Damped Track) and minmax (floor) constraint */ typedef enum eTrackToAxis_Modes { TRACK_X = 0, - TRACK_Y, - TRACK_Z, - TRACK_nX, - TRACK_nY, - TRACK_nZ + TRACK_Y = 1, + TRACK_Z = 2, + TRACK_nX = 3, + TRACK_nY = 4, + TRACK_nZ = 5 } eTrackToAxis_Modes; /* FollowPath flags */ @@ -606,24 +606,24 @@ typedef enum eTrackTo_Flags { /* Strech To Constraint -> volmode */ typedef enum eStretchTo_VolMode { VOLUME_XZ = 0, - VOLUME_X, - VOLUME_Z, - NO_VOLUME + VOLUME_X = 1, + VOLUME_Z = 2, + NO_VOLUME = 3 } eStretchTo_VolMode; /* Stretch To Constraint -> plane mode */ typedef enum eStretchTo_PlaneMode { PLANE_X = 0, - PLANE_Y, - PLANE_Z + PLANE_Y = 1, + PLANE_Z = 2 } eStretchTo_PlaneMode; /* Clamp-To Constraint ->flag */ typedef enum eClampTo_Modes { CLAMPTO_AUTO = 0, - CLAMPTO_X, - CLAMPTO_Y, - CLAMPTO_Z + CLAMPTO_X = 1, + CLAMPTO_Y = 2, + CLAMPTO_Z = 3 } eClampTo_Modes; /* ClampTo Constraint ->flag2 */ @@ -673,9 +673,9 @@ typedef enum eSplineIK_XZScaleModes { /* no x/z scaling */ CONSTRAINT_SPLINEIK_XZS_NONE = 0, /* bones in the chain should take their x/z scales from the original scaling */ - CONSTRAINT_SPLINEIK_XZS_ORIGINAL, + CONSTRAINT_SPLINEIK_XZS_ORIGINAL = 1, /* x/z scales are the inverse of the y-scale */ - CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC + CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC = 2 } eSplineIK_XZScaleModes; /* MinMax (floor) flags */ @@ -721,9 +721,9 @@ typedef enum eDistLimit_Flag { /* bDistLimitConstraint->mode */ typedef enum eDistLimit_Modes { - LIMITDIST_INSIDE = 0, - LIMITDIST_OUTSIDE, - LIMITDIST_ONSURFACE + LIMITDIST_INSIDE = 0, + LIMITDIST_OUTSIDE = 1, + LIMITDIST_ONSURFACE = 2 } eDistLimit_Modes; /* python constraint -> flag */ @@ -753,18 +753,18 @@ typedef enum ePivotConstraint_Axis { PIVOTCON_AXIS_NONE = -1, /* consider -ve x-axis rotations */ - PIVOTCON_AXIS_X_NEG, + PIVOTCON_AXIS_X_NEG = 0, /* consider -ve y-axis rotations */ - PIVOTCON_AXIS_Y_NEG, + PIVOTCON_AXIS_Y_NEG = 1, /* consider -ve z-axis rotations */ - PIVOTCON_AXIS_Z_NEG, + PIVOTCON_AXIS_Z_NEG = 2, /* consider +ve x-axis rotations */ - PIVOTCON_AXIS_X, + PIVOTCON_AXIS_X = 3, /* consider +ve y-axis rotations */ - PIVOTCON_AXIS_Y, + PIVOTCON_AXIS_Y = 4, /* consider +ve z-axis rotations */ - PIVOTCON_AXIS_Z + PIVOTCON_AXIS_Z = 5 } ePivotConstraint_Axis; /* settings for Pivot Constraint in general */ diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index da8458d587e..f5c0148d9d0 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -315,26 +315,26 @@ typedef struct Curve { /* h1 h2 (beztriple) */ typedef enum eBezTriple_Handle { - HD_FREE = 0, - HD_AUTO, - HD_VECT, - HD_ALIGN, - HD_AUTO_ANIM /* auto-clamped handles for animation */ + HD_FREE = 0, + HD_AUTO = 1, + HD_VECT = 2, + HD_ALIGN = 3, + HD_AUTO_ANIM = 4 /* auto-clamped handles for animation */ } eBezTriple_Handle; /* interpolation modes (used only for BezTriple->ipo) */ typedef enum eBezTriple_Interpolation { BEZT_IPO_CONST = 0, /* constant interpolation */ - BEZT_IPO_LIN, /* linear interpolation */ - BEZT_IPO_BEZ /* bezier interpolation */ + BEZT_IPO_LIN = 1, /* linear interpolation */ + BEZT_IPO_BEZ = 2 /* bezier interpolation */ } eBezTriple_Interpolation; /* types of keyframe (used only for BezTriple->hide when BezTriple is used in F-Curves) */ typedef enum eBezTriple_KeyframeType { BEZT_KEYTYPE_KEYFRAME = 0, /* default - 'proper' Keyframe */ - BEZT_KEYTYPE_EXTREME, /* 'extreme' keyframe */ - BEZT_KEYTYPE_BREAKDOWN, /* 'breakdown' keyframe */ - BEZT_KEYTYPE_JITTER, /* 'jitter' keyframe (for adding 'filler' secondary motion) */ + BEZT_KEYTYPE_EXTREME = 1, /* 'extreme' keyframe */ + BEZT_KEYTYPE_BREAKDOWN = 2, /* 'breakdown' keyframe */ + BEZT_KEYTYPE_JITTER = 3, /* 'jitter' keyframe (for adding 'filler' secondary motion) */ } eBezTriple_KeyframeType; /* checks if the given BezTriple is selected */ diff --git a/source/blender/makesdna/DNA_mask_types.h b/source/blender/makesdna/DNA_mask_types.h index 20701f9adc0..52fedd72e86 100644 --- a/source/blender/makesdna/DNA_mask_types.h +++ b/source/blender/makesdna/DNA_mask_types.h @@ -155,9 +155,9 @@ typedef struct MaskLayer { /* SpaceClip->mask_draw_type */ enum { MASK_DT_OUTLINE = 0, - MASK_DT_DASH, - MASK_DT_BLACK, - MASK_DT_WHITE + MASK_DT_DASH = 1, + MASK_DT_BLACK = 2, + MASK_DT_WHITE = 3 }; /* masklay->blend */ diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index cf8b08549f6..4172db90c05 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -35,49 +35,49 @@ * (ONLY ADD NEW ITEMS AT THE END) */ typedef enum ModifierType { - eModifierType_None = 0, - eModifierType_Subsurf, - eModifierType_Lattice, - eModifierType_Curve, - eModifierType_Build, - eModifierType_Mirror, - eModifierType_Decimate, - eModifierType_Wave, - eModifierType_Armature, - eModifierType_Hook, - eModifierType_Softbody, - eModifierType_Boolean, - eModifierType_Array, - eModifierType_EdgeSplit, - eModifierType_Displace, - eModifierType_UVProject, - eModifierType_Smooth, - eModifierType_Cast, - eModifierType_MeshDeform, - eModifierType_ParticleSystem, - eModifierType_ParticleInstance, - eModifierType_Explode, - eModifierType_Cloth, - eModifierType_Collision, - eModifierType_Bevel, - eModifierType_Shrinkwrap, - eModifierType_Fluidsim, - eModifierType_Mask, - eModifierType_SimpleDeform, - eModifierType_Multires, - eModifierType_Surface, - eModifierType_Smoke, - eModifierType_ShapeKey, - eModifierType_Solidify, - eModifierType_Screw, - eModifierType_Warp, - eModifierType_WeightVGEdit, - eModifierType_WeightVGMix, - eModifierType_WeightVGProximity, - eModifierType_Ocean, - eModifierType_DynamicPaint, - eModifierType_Remesh, - eModifierType_Skin, + eModifierType_None = 0, + eModifierType_Subsurf = 1, + eModifierType_Lattice = 2, + eModifierType_Curve = 3, + eModifierType_Build = 4, + eModifierType_Mirror = 5, + eModifierType_Decimate = 6, + eModifierType_Wave = 7, + eModifierType_Armature = 8, + eModifierType_Hook = 9, + eModifierType_Softbody = 10, + eModifierType_Boolean = 11, + eModifierType_Array = 12, + eModifierType_EdgeSplit = 13, + eModifierType_Displace = 14, + eModifierType_UVProject = 15, + eModifierType_Smooth = 16, + eModifierType_Cast = 17, + eModifierType_MeshDeform = 18, + eModifierType_ParticleSystem = 19, + eModifierType_ParticleInstance = 20, + eModifierType_Explode = 21, + eModifierType_Cloth = 22, + eModifierType_Collision = 23, + eModifierType_Bevel = 24, + eModifierType_Shrinkwrap = 25, + eModifierType_Fluidsim = 26, + eModifierType_Mask = 27, + eModifierType_SimpleDeform = 28, + eModifierType_Multires = 29, + eModifierType_Surface = 30, + eModifierType_Smoke = 31, + eModifierType_ShapeKey = 32, + eModifierType_Solidify = 33, + eModifierType_Screw = 34, + eModifierType_Warp = 35, + eModifierType_WeightVGEdit = 36, + eModifierType_WeightVGMix = 37, + eModifierType_WeightVGProximity = 38, + eModifierType_Ocean = 39, + eModifierType_DynamicPaint = 40, + eModifierType_Remesh = 41, + eModifierType_Skin = 42, NUM_MODIFIER_TYPES } ModifierType; @@ -327,19 +327,19 @@ typedef struct DisplaceModifierData { /* DisplaceModifierData->direction */ enum { - MOD_DISP_DIR_X, - MOD_DISP_DIR_Y, - MOD_DISP_DIR_Z, - MOD_DISP_DIR_NOR, - MOD_DISP_DIR_RGB_XYZ, + MOD_DISP_DIR_X = 0, + MOD_DISP_DIR_Y = 1, + MOD_DISP_DIR_Z = 2, + MOD_DISP_DIR_NOR = 3, + MOD_DISP_DIR_RGB_XYZ = 4, }; /* DisplaceModifierData->texmapping */ enum { - MOD_DISP_MAP_LOCAL, - MOD_DISP_MAP_GLOBAL, - MOD_DISP_MAP_OBJECT, - MOD_DISP_MAP_UV + MOD_DISP_MAP_LOCAL = 0, + MOD_DISP_MAP_GLOBAL = 1, + MOD_DISP_MAP_OBJECT = 2, + MOD_DISP_MAP_UV = 3 }; typedef struct UVProjectModifierData { @@ -509,9 +509,9 @@ typedef struct SurfaceModifierData { } SurfaceModifierData; typedef enum { - eBooleanModifierOp_Intersect, - eBooleanModifierOp_Union, - eBooleanModifierOp_Difference, + eBooleanModifierOp_Intersect = 0, + eBooleanModifierOp_Union = 1, + eBooleanModifierOp_Difference = 2, } BooleanModifierOp; typedef struct BooleanModifierData { ModifierData modifier; diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index cc212dd6d06..854087b3b5b 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -40,20 +40,20 @@ extern "C" { /* pd->forcefield: Effector Fields types */ typedef enum PFieldType { - PFIELD_NULL = 0, /* (this is used for general effector weight) */ - PFIELD_FORCE, /* Force away/towards a point depending on force strength */ - PFIELD_VORTEX, /* Force around the effector normal */ - PFIELD_MAGNET, /* Force from the cross product of effector normal and point velocity */ - PFIELD_WIND, /* Force away and towards a point depending which side of the effector */ - /* normal the point is */ - PFIELD_GUIDE, /* Force along curve for dynamics, a shaping curve for hair paths */ - PFIELD_TEXTURE, /* Force based on texture values calculated at point coordinates */ - PFIELD_HARMONIC, /* Force of a harmonic (damped) oscillator */ - PFIELD_CHARGE, /* Force away/towards a point depending on point charge */ - PFIELD_LENNARDJ, /* Force due to a Lennard-Jones potential */ - PFIELD_BOID, /* Defines predator / goal for boids */ - PFIELD_TURBULENCE, /* Force defined by BLI_gTurbulence */ - PFIELD_DRAG, /* Linear & quadratic drag */ + PFIELD_NULL = 0, /* (this is used for general effector weight) */ + PFIELD_FORCE = 1, /* Force away/towards a point depending on force strength */ + PFIELD_VORTEX = 2, /* Force around the effector normal */ + PFIELD_MAGNET = 3, /* Force from the cross product of effector normal and point velocity */ + PFIELD_WIND = 4, /* Force away and towards a point depending which side of the effector */ + /* normal the point is */ + PFIELD_GUIDE = 5, /* Force along curve for dynamics, a shaping curve for hair paths */ + PFIELD_TEXTURE = 6, /* Force based on texture values calculated at point coordinates */ + PFIELD_HARMONIC = 7, /* Force of a harmonic (damped) oscillator */ + PFIELD_CHARGE = 8, /* Force away/towards a point depending on point charge */ + PFIELD_LENNARDJ = 9, /* Force due to a Lennard-Jones potential */ + PFIELD_BOID = 10, /* Defines predator / goal for boids */ + PFIELD_TURBULENCE = 11, /* Force defined by BLI_gTurbulence */ + PFIELD_DRAG = 12, /* Linear & quadratic drag */ NUM_PFIELD_TYPES } PFieldType; diff --git a/source/blender/makesdna/DNA_packedFile_types.h b/source/blender/makesdna/DNA_packedFile_types.h index 339ac0f8c0d..f01e89d18c9 100644 --- a/source/blender/makesdna/DNA_packedFile_types.h +++ b/source/blender/makesdna/DNA_packedFile_types.h @@ -43,18 +43,18 @@ typedef struct PackedFile { enum PF_FileStatus { PF_EQUAL = 0, - PF_DIFFERS, - PF_NOFILE, + PF_DIFFERS = 1, + PF_NOFILE = 2, - PF_WRITE_ORIGINAL, - PF_WRITE_LOCAL, - PF_USE_LOCAL, - PF_USE_ORIGINAL, - PF_KEEP, - PF_REMOVE, - PF_NOOP, + PF_WRITE_ORIGINAL = 3, + PF_WRITE_LOCAL = 4, + PF_USE_LOCAL = 5, + PF_USE_ORIGINAL = 6, + PF_KEEP = 7, + PF_REMOVE = 8, + PF_NOOP = 9, - PF_ASK + PF_ASK = 10 }; #endif /* PACKEDFILE_TYPES_H */ diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 75d9b91e9c8..34fb7ce60be 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -225,13 +225,13 @@ typedef struct ARegion { /* Do NOT change order, append on end. Types are hardcoded needed */ enum { RGN_TYPE_WINDOW = 0, - RGN_TYPE_HEADER, - RGN_TYPE_CHANNELS, - RGN_TYPE_TEMPORARY, - RGN_TYPE_UI, - RGN_TYPE_TOOLS, - RGN_TYPE_TOOL_PROPS, - RGN_TYPE_PREVIEW + RGN_TYPE_HEADER = 1, + RGN_TYPE_CHANNELS = 2, + RGN_TYPE_TEMPORARY = 3, + RGN_TYPE_UI = 4, + RGN_TYPE_TOOLS = 5, + RGN_TYPE_TOOL_PROPS = 6, + RGN_TYPE_PREVIEW = 7 }; /* region alignment */ diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index 6f67f1fd3c9..6dc45e4a6de 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -104,8 +104,8 @@ typedef struct bSound { typedef enum eSound_Type { SOUND_TYPE_INVALID = -1, SOUND_TYPE_FILE = 0, - SOUND_TYPE_BUFFER, - SOUND_TYPE_LIMITER + SOUND_TYPE_BUFFER = 1, + SOUND_TYPE_LIMITER = 2 } eSound_Type; #endif diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 6a95628b650..2f6ea861cba 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -167,18 +167,18 @@ typedef struct SpaceButs { /* buts->mainb new */ typedef enum eSpaceButtons_Context { BCONTEXT_RENDER = 0, - BCONTEXT_SCENE, - BCONTEXT_WORLD, - BCONTEXT_OBJECT, - BCONTEXT_DATA, - BCONTEXT_MATERIAL, - BCONTEXT_TEXTURE, - BCONTEXT_PARTICLE, - BCONTEXT_PHYSICS, - BCONTEXT_BONE, - BCONTEXT_MODIFIER, - BCONTEXT_CONSTRAINT, - BCONTEXT_BONE_CONSTRAINT, + BCONTEXT_SCENE = 1, + BCONTEXT_WORLD = 2, + BCONTEXT_OBJECT = 3, + BCONTEXT_DATA = 4, + BCONTEXT_MATERIAL = 5, + BCONTEXT_TEXTURE = 6, + BCONTEXT_PARTICLE = 7, + BCONTEXT_PHYSICS = 8, + BCONTEXT_BONE = 9, + BCONTEXT_MODIFIER = 10, + BCONTEXT_CONSTRAINT = 11, + BCONTEXT_BONE_CONSTRAINT = 12, /* always as last... */ BCONTEXT_TOT @@ -194,17 +194,17 @@ typedef enum eSpaceButtons_Context { /* sbuts->texture_context */ typedef enum eSpaceButtons_Texture_Context { SB_TEXC_MAT_OR_LAMP = 0, - SB_TEXC_WORLD, - SB_TEXC_BRUSH, - SB_TEXC_PARTICLES, + SB_TEXC_WORLD = 1, + SB_TEXC_BRUSH = 2, + SB_TEXC_PARTICLES = 3, } eSpaceButtons_Texture_Context; /* sbuts->align */ typedef enum eSpaceButtons_Align { BUT_FREE = 0, - BUT_HORIZONTAL, - BUT_VERTICAL, - BUT_AUTO, + BUT_HORIZONTAL = 1, + BUT_VERTICAL = 2, + BUT_AUTO = 3, } eSpaceButtons_Align; /* sbuts->scaflag */ @@ -256,19 +256,19 @@ typedef enum eSpaceOutliner_Flag { /* SpaceOops->outlinevis */ typedef enum eSpaceOutliner_Mode { SO_ALL_SCENES = 0, - SO_CUR_SCENE, - SO_VISIBLE, - SO_SELECTED, - SO_ACTIVE, - SO_SAME_TYPE, - SO_GROUPS, - SO_LIBRARIES, - SO_VERSE_SESSION, - SO_VERSE_MS, - SO_SEQUENCE, - SO_DATABLOCKS, - SO_USERDEF, - SO_KEYMAP, + SO_CUR_SCENE = 1, + SO_VISIBLE = 2, + SO_SELECTED = 3, + SO_ACTIVE = 4, + SO_SAME_TYPE = 5, + SO_GROUPS = 6, + SO_LIBRARIES = 7, + SO_VERSE_SESSION = 8, + SO_VERSE_MS = 9, + SO_SEQUENCE = 10, + SO_DATABLOCKS = 11, + SO_USERDEF = 12, + SO_KEYMAP = 13, } eSpaceOutliner_Mode; /* SpaceOops->storeflag */ @@ -351,7 +351,7 @@ typedef enum eGraphEdit_Mode { /* all animation curves (from all over Blender) */ SIPO_MODE_ANIMATION = 0, /* drivers only */ - SIPO_MODE_DRIVERS, + SIPO_MODE_DRIVERS = 1, } eGraphEdit_Mode; @@ -479,10 +479,10 @@ typedef struct SpaceSeq { /* sseq->mainb */ typedef enum eSpaceSeq_RegionType { SEQ_DRAW_SEQUENCE = 0, - SEQ_DRAW_IMG_IMBUF, - SEQ_DRAW_IMG_WAVEFORM, - SEQ_DRAW_IMG_VECTORSCOPE, - SEQ_DRAW_IMG_HISTOGRAM, + SEQ_DRAW_IMG_IMBUF = 1, + SEQ_DRAW_IMG_WAVEFORM = 2, + SEQ_DRAW_IMG_VECTORSCOPE = 3, + SEQ_DRAW_IMG_HISTOGRAM = 4, } eSpaceSeq_RegionType; /* sseq->flag */ @@ -498,8 +498,8 @@ typedef enum eSpaceSeq_Flag { /* sseq->view */ typedef enum eSpaceSeq_Displays { SEQ_VIEW_SEQUENCE = 1, - SEQ_VIEW_PREVIEW, - SEQ_VIEW_SEQUENCE_PREVIEW, + SEQ_VIEW_PREVIEW = 2, + SEQ_VIEW_SEQUENCE_PREVIEW = 3, } eSpaceSeq_Dispays; /* sseq->render_size */ @@ -579,18 +579,18 @@ typedef struct SpaceFile { /* FileSelectParams.display */ enum FileDisplayTypeE { FILE_DEFAULTDISPLAY = 0, - FILE_SHORTDISPLAY, - FILE_LONGDISPLAY, - FILE_IMGDISPLAY + FILE_SHORTDISPLAY = 1, + FILE_LONGDISPLAY = 2, + FILE_IMGDISPLAY = 3 }; /* FileSelectParams.sort */ enum FileSortTypeE { FILE_SORT_NONE = 0, FILE_SORT_ALPHA = 1, - FILE_SORT_EXTENSION, - FILE_SORT_TIME, - FILE_SORT_SIZE + FILE_SORT_EXTENSION = 2, + FILE_SORT_TIME = 3, + FILE_SORT_SIZE = 4 }; /* these values need to be hardcoded in structs, dna does not recognize defines */ @@ -613,7 +613,7 @@ enum FileSortTypeE { /* filesel op property -> action */ typedef enum eFileSel_Action { FILE_OPENFILE = 0, - FILE_SAVE, + FILE_SAVE = 1, } eFileSel_Action; /* sfile->params->flag and simasel->flag */ @@ -695,15 +695,15 @@ typedef struct SpaceImage { /* SpaceImage->dt_uv */ typedef enum eSpaceImage_UVDT { SI_UVDT_OUTLINE = 0, - SI_UVDT_DASH, - SI_UVDT_BLACK, - SI_UVDT_WHITE, + SI_UVDT_DASH = 1, + SI_UVDT_BLACK = 2, + SI_UVDT_WHITE = 3, } eSpaceImage_UVDT; /* SpaceImage->dt_uvstretch */ typedef enum eSpaceImage_UVDT_Stretch { SI_UVDT_STRETCH_ANGLE = 0, - SI_UVDT_STRETCH_AREA, + SI_UVDT_STRETCH_AREA = 1, } eSpaceImage_UVDT_Stretch; /* SpaceImage->sticky @@ -885,14 +885,14 @@ typedef enum eSpaceNode_Flag { /* snode->texfrom */ typedef enum eSpaceNode_TexFrom { SNODE_TEX_OBJECT = 0, - SNODE_TEX_WORLD, - SNODE_TEX_BRUSH, + SNODE_TEX_WORLD = 1, + SNODE_TEX_BRUSH = 2, } eSpaceNode_TexFrom; /* snode->shaderfrom */ typedef enum eSpaceNode_ShaderFrom { SNODE_SHADER_OBJECT = 0, - SNODE_SHADER_WORLD, + SNODE_SHADER_WORLD = 1, } eSpaceNode_ShaderFrom; /* Game Logic Editor ===================================== */ @@ -930,9 +930,9 @@ typedef struct ConsoleLine { /* ConsoleLine.type */ typedef enum eConsoleLine_Type { CONSOLE_LINE_OUTPUT = 0, - CONSOLE_LINE_INPUT, - CONSOLE_LINE_INFO, /* autocomp feedback */ - CONSOLE_LINE_ERROR + CONSOLE_LINE_INPUT = 1, + CONSOLE_LINE_INFO = 2, /* autocomp feedback */ + CONSOLE_LINE_ERROR = 3 } eConsoleLine_Type; @@ -1044,16 +1044,16 @@ typedef enum eSpaceClip_Flag { /* SpaceClip->mode */ typedef enum eSpaceClip_Mode { SC_MODE_TRACKING = 0, - SC_MODE_RECONSTRUCTION, - SC_MODE_DISTORTION, - SC_MODE_MASKEDIT, + SC_MODE_RECONSTRUCTION = 1, + SC_MODE_DISTORTION = 2, + SC_MODE_MASKEDIT = 3, } eSpaceClip_Mode; /* SpaceClip->view */ typedef enum eSpaceClip_View { SC_VIEW_CLIP = 0, - SC_VIEW_GRAPH, - SC_VIEW_DOPESHEET, + SC_VIEW_GRAPH = 1, + SC_VIEW_DOPESHEET = 2, } eSpaceClip_View; /* SpaceClip->gpencil_src */ @@ -1072,27 +1072,27 @@ typedef enum eSpaceClip_GPencil_Source { /* space types, moved from DNA_screen_types.h */ /* Do NOT change order, append on end. types are hardcoded needed */ typedef enum eSpace_Type { - SPACE_EMPTY, - SPACE_VIEW3D, - SPACE_IPO, - SPACE_OUTLINER, - SPACE_BUTS, - SPACE_FILE, - SPACE_IMAGE, - SPACE_INFO, - SPACE_SEQ, - SPACE_TEXT, - SPACE_IMASEL, /* deprecated */ - SPACE_SOUND, /* Deprecated */ - SPACE_ACTION, - SPACE_NLA, - SPACE_SCRIPT, /* Deprecated */ - SPACE_TIME, - SPACE_NODE, - SPACE_LOGIC, - SPACE_CONSOLE, - SPACE_USERPREF, - SPACE_CLIP, + SPACE_EMPTY = 0, + SPACE_VIEW3D = 1, + SPACE_IPO = 2, + SPACE_OUTLINER = 3, + SPACE_BUTS = 4, + SPACE_FILE = 5, + SPACE_IMAGE = 6, + SPACE_INFO = 7, + SPACE_SEQ = 8, + SPACE_TEXT = 9, + SPACE_IMASEL = 10, /* deprecated */ + SPACE_SOUND = 11, /* Deprecated */ + SPACE_ACTION = 12, + SPACE_NLA = 13, + SPACE_SCRIPT = 14, /* Deprecated */ + SPACE_TIME = 15, + SPACE_NODE = 16, + SPACE_LOGIC = 17, + SPACE_CONSOLE = 18, + SPACE_USERPREF = 19, + SPACE_CLIP = 20, SPACEICONMAX = SPACE_CLIP } eSpace_Type; diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h index e1e7408fe14..1ab64ed1cc1 100644 --- a/source/blender/makesdna/DNA_tracking_types.h +++ b/source/blender/makesdna/DNA_tracking_types.h @@ -271,7 +271,7 @@ typedef struct MovieTracking { /* MovieTrackingCamera->units */ enum { CAMERA_UNITS_PX = 0, - CAMERA_UNITS_MM + CAMERA_UNITS_MM = 1 }; /* MovieTrackingMarker->flag */ -- cgit v1.2.3