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/DNA_actuator_types.h | |
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/DNA_actuator_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_actuator_types.h | 17 |
1 files changed, 5 insertions, 12 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 |