diff options
author | Daniel Dunbar <daniel@zuster.org> | 2005-08-03 22:48:22 +0400 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2005-08-03 22:48:22 +0400 |
commit | b03a20d2721c938f0e65bf9a426fd44028c4592a (patch) | |
tree | 21d5a1f1d1bb5924b6cceec5eb1e34c1afea491f /source/blender/makesdna | |
parent | 2cc6d565cbc9da005e1c13828c6b3a3d46cd32cb (diff) |
- got rid of silly #define ..._BIT, #define ... (1<<..._BIT) stuff
- switched almost all uiDefBut(..., TOG|BIT|..) to use UiDefButBit and the
name of the actual bit define instead of just a magic constant, this makes
searching the code much nicer. most of the credit here goes to LetterRip
who did almost all of the conversions, I mostly just checked them over.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_actuator_types.h | 17 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_armature_types.h | 20 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_constraint_types.h | 5 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_nla_types.h | 6 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_sensor_types.h | 7 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_sound_types.h | 32 |
6 files changed, 16 insertions, 71 deletions
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index 40a6c4a80a0..7bb367cc244 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -306,16 +306,10 @@ typedef struct FreeCamera { #define ACT_GROUP_SET 6 /* ipoactuator->flag */ -#define ACT_IPOFORCE_BIT 0 -#define ACT_IPOEND_BIT 1 -#define ACT_IPOFORCE_LOCAL_BIT 2 -// unused: 3 -#define ACT_IPOCHILD_BIT 4 - -#define ACT_IPOFORCE (1 << ACT_IPOFORCE_BIT) -#define ACT_IPOEND (1 << ACT_IPOEND_BIT) -#define ACT_IPOFORCE_LOCAL (1 << ACT_IPOFORCE_LOCAL_BIT) -#define ACT_IPOCHILD (1 << ACT_IPOCHILD_BIT) +#define ACT_IPOFORCE (1 << 0) +#define ACT_IPOEND (1 << 1) +#define ACT_IPOFORCE_LOCAL (1 << 2) +#define ACT_IPOCHILD (1 << 4) /* ipoactuator->flag for k2k */ #define ACT_K2K_PREV 1 @@ -399,8 +393,7 @@ typedef struct FreeCamera { /* visibilityact->flag */ /* Set means the object will become invisible */ -#define ACT_VISIBILITY_INVISIBLE_BIT 0 -#define ACT_VISIBILITY_INVISIBLE (1 << ACT_VISIBILITY_INVISIBLE_BIT) +#define ACT_VISIBILITY_INVISIBLE (1 << 0) #endif diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index cda8751a30b..014e6925d56 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -80,13 +80,6 @@ typedef struct bArmature { }bArmature; /* armature->flag */ -#define ARM_RESTPOSBIT 0 - -#define ARM_DRAWAXESBIT 2 -#define ARM_DRAWNAMESBIT 3 -#define ARM_POSEBIT 4 -#define ARM_EDITBIT 5 -#define ARM_DELAYBIT 6 /* dont use bit 7, was saved in files to disable stuff */ /* armature->flag */ @@ -131,19 +124,6 @@ typedef struct bArmature { enum { BONE_SKINNABLE = 0, BONE_UNSKINNABLE, - BONE_HEAD, - BONE_NECK, - BONE_BACK, - BONE_SHOULDER, - BONE_ARM, - BONE_HAND, - BONE_FINGER, - BONE_THUMB, - BONE_PELVIS, - BONE_LEG, - BONE_FOOT, - BONE_TOE, - BONE_TENTACLE }; #endif diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index cfb180cf33d..95c1053ba8e 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -178,11 +178,6 @@ typedef struct bStretchToConstraint{ #define CONSTRAINT_DISABLE 0x00000004 #define CONSTRAINT_LOOPTESTED 0x00000008 - -#define CONSTRAINT_EXPAND_BIT 0 -#define CONSTRAINT_DONE_BIT 1 -#define CONSTRAINT_DISABLE_BIT 2 - /* bConstraintChannel.flag */ #define CONSTRAINT_CHANNEL_SELECT 0x00000001 diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h index 8c3c4d7a7a3..49c8363192c 100644 --- a/source/blender/makesdna/DNA_nla_types.h +++ b/source/blender/makesdna/DNA_nla_types.h @@ -57,15 +57,9 @@ typedef struct bActionStrip { #define ACTSTRIPMODE_ADD 1 #define ACTSTRIP_SELECT 0x00000001 - #define ACTSTRIP_USESTRIDE 0x00000002 #define ACTSTRIP_BLENDTONEXT 0x00000004 #define ACTSTRIP_HOLDLASTFRAME 0x00000008 -#define ACTSTRIP_SELECTBIT 0 -#define ACTSTRIP_USESTRIDEBIT 1 -#define ACTSTRIP_BLENDTONEXTBIT 2 -#define ACTSTRIP_HOLDLASTFRAMEBIT 3 - #endif diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h index c56fe81ca19..4df3ecb5a11 100644 --- a/source/blender/makesdna/DNA_sensor_types.h +++ b/source/blender/makesdna/DNA_sensor_types.h @@ -213,11 +213,8 @@ typedef struct bJoystickSensor { #define SENS_NEG_PULSE_MODE 4 /* sensor->suppress */ -#define SENS_SUPPRESS_POSITIVE_BIT 0 -#define SENS_SUPPRESS_NEGATIVE_BIT 1 - -#define SENS_SUPPRESS_POSITIVE (1 << SENS_SUPPRESS_POSITIVE_BIT) -#define SENS_SUPPRESS_NEGATIVE (1 << SENS_SUPPRESS_NEGATIVE_BIT) +#define SENS_SUPPRESS_POSITIVE (1 << 0) +#define SENS_SUPPRESS_NEGATIVE (1 << 1) /* collision, ray sensor modes: */ /* A little bit fake: when property is active, the first bit is diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index 82b457ac003..1ec788976df 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -169,29 +169,15 @@ enum SAMPLE_FileTypes { #define SOUND_CHANNELS_LEFT 1 #define SOUND_CHANNELS_RIGHT 2 -enum SOUND_FLAGS_BITS { - SOUND_FLAGS_LOOP_BIT = 0, - SOUND_FLAGS_FIXED_VOLUME_BIT, - SOUND_FLAGS_FIXED_PANNING_BIT, - SOUND_FLAGS_3D_BIT, - SOUND_FLAGS_BIDIRECTIONAL_LOOP_BIT, - SOUND_FLAGS_PRIORITY_BIT, - SOUND_FLAGS_SEQUENCE_BIT -}; - -#define SOUND_FLAGS_LOOP (1 << SOUND_FLAGS_LOOP_BIT) -#define SOUND_FLAGS_FIXED_VOLUME (1 << SOUND_FLAGS_FIXED_VOLUME_BIT) -#define SOUND_FLAGS_FIXED_PANNING (1 << SOUND_FLAGS_FIXED_PANNING_BIT) -#define SOUND_FLAGS_3D (1 << SOUND_FLAGS_3D_BIT) -#define SOUND_FLAGS_BIDIRECTIONAL_LOOP (1 << SOUND_FLAGS_BIDIRECTIONAL_LOOP_BIT) -#define SOUND_FLAGS_PRIORITY (1 << SOUND_FLAGS_PRIORITY_BIT) -#define SOUND_FLAGS_SEQUENCE (1 << SOUND_FLAGS_SEQUENCE_BIT) - -enum SAMPLE_FLAGS_BITS { - SAMPLE_NEEDS_SAVE_BIT = 0 -}; - -#define SAMPLE_NEEDS_SAVE (1 << SAMPLE_NEEDS_SAVE_BIT) +#define SOUND_FLAGS_LOOP (1 << 0) +#define SOUND_FLAGS_FIXED_VOLUME (1 << 1) +#define SOUND_FLAGS_FIXED_PANNING (1 << 2) +#define SOUND_FLAGS_3D (1 << 3) +#define SOUND_FLAGS_BIDIRECTIONAL_LOOP (1 << 4) +#define SOUND_FLAGS_PRIORITY (1 << 5) +#define SOUND_FLAGS_SEQUENCE (1 << 6) + +#define SAMPLE_NEEDS_SAVE (1 << 0) /* to DNA_sound_types.h*/ |