Revision: 47956
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47956
Author: nazgul
Date: 2012-06-15 14:11:05 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/DNA_ID.h
trunk/blender/source/blender/makesdna/DNA_action_types.h
trunk/blender/source/blender/makesdna/DNA_anim_types.h
trunk/blender/source/blender/makesdna/DNA_armature_types.h
trunk/blender/source/blender/makesdna/DNA_boid_types.h
trunk/blender/source/blender/makesdna/DNA_brush_types.h
trunk/blender/source/blender/makesdna/DNA_color_types.h
trunk/blender/source/blender/makesdna/DNA_constraint_types.h
trunk/blender/source/blender/makesdna/DNA_curve_types.h
trunk/blender/source/blender/makesdna/DNA_mask_types.h
trunk/blender/source/blender/makesdna/DNA_modifier_types.h
trunk/blender/source/blender/makesdna/DNA_object_force.h
trunk/blender/source/blender/makesdna/DNA_packedFile_types.h
trunk/blender/source/blender/makesdna/DNA_screen_types.h
trunk/blender/source/blender/makesdna/DNA_sound_types.h
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/makesdna/DNA_tracking_types.h
Modified: trunk/blender/source/blender/makesdna/DNA_ID.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_ID.h 2012-06-15 13:56:54 UTC
(rev 47955)
+++ trunk/blender/source/blender/makesdna/DNA_ID.h 2012-06-15 14:11:05 UTC
(rev 47956)
@@ -139,8 +139,8 @@
} 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)
Modified: trunk/blender/source/blender/makesdna/DNA_action_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_action_types.h 2012-06-15
13:56:54 UTC (rev 47955)
+++ trunk/blender/source/blender/makesdna/DNA_action_types.h 2012-06-15
14:11:05 UTC (rev 47956)
@@ -373,7 +373,7 @@
/* 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 */
Modified: trunk/blender/source/blender/makesdna/DNA_anim_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_anim_types.h 2012-06-15
13:56:54 UTC (rev 47955)
+++ trunk/blender/source/blender/makesdna/DNA_anim_types.h 2012-06-15
14:11:05 UTC (rev 47956)
@@ -72,15 +72,15 @@
*/
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 @@
/* 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 @@
/* '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;
Modified: trunk/blender/source/blender/makesdna/DNA_armature_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_armature_types.h 2012-06-15
13:56:54 UTC (rev 47955)
+++ trunk/blender/source/blender/makesdna/DNA_armature_types.h 2012-06-15
14:11:05 UTC (rev 47956)
@@ -135,16 +135,16 @@
/* 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 @@
// 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 */
Modified: trunk/blender/source/blender/makesdna/DNA_boid_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_boid_types.h 2012-06-15
13:56:54 UTC (rev 47955)
+++ trunk/blender/source/blender/makesdna/DNA_boid_types.h 2012-06-15
14:11:05 UTC (rev 47956)
@@ -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 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 @@
// 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 enum BoidRulesetType {
eBoidRulesetType_Fuzzy = 0,
- eBoidRulesetType_Random,
- eBoidRulesetType_Average,
+ eBoidRulesetType_Random = 1,
+ eBoidRulesetType_Average = 2,
NUM_BOID_RULESET_TYPES
} BoidRulesetType;
#define BOIDSTATE_CURRENT 1
Modified: trunk/blender/source/blender/makesdna/DNA_brush_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_brush_types.h 2012-06-15
13:56:54 UTC (rev 47955)
+++ trunk/blender/source/blender/makesdna/DNA_brush_types.h 2012-06-15
14:11:05 UTC (rev 47956)
@@ -174,26 +174,26 @@
/* 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
Modified: trunk/blender/source/blender/makesdna/DNA_color_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_color_types.h 2012-06-15
13:56:54 UTC (rev 47955)
+++ trunk/blender/source/blender/makesdna/DNA_color_types.h 2012-06-15
14:11:05 UTC (rev 47956)
@@ -86,13 +86,13 @@
/* 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 */
Modified: trunk/blender/source/blender/makesdna/DNA_constraint_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_constraint_types.h
2012-06-15 13:56:54 UTC (rev 47955)
+++ trunk/blender/source/blender/makesdna/DNA_constraint_types.h
2012-06-15 14:11:05 UTC (rev 47956)
@@ -104,9 +104,9 @@
/* bConstraintTarget/bConstraintOb -> type */
typedef enum B_CONSTRAINT_OB_TYPE {
CONSTRAINT_OBTYPE_OBJECT = 1, /* string is ""
*/
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
