diff options
Diffstat (limited to 'source/blender/blenkernel/BKE_utildefines.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_utildefines.h | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h index 591be9e81c4..0ed2db2aad2 100644 --- a/source/blender/blenkernel/BKE_utildefines.h +++ b/source/blender/blenkernel/BKE_utildefines.h @@ -42,9 +42,9 @@ extern "C" { /* these values need to be hardcoded in structs, dna does not recognize defines */ /* also defined in DNA_space_types.h */ #ifndef FILE_MAXDIR -#define FILE_MAXDIR 768 -#define FILE_MAXFILE 256 -#define FILE_MAX 1024 +#define FILE_MAXDIR 768 +#define FILE_MAXFILE 256 +#define FILE_MAX 1024 #endif /* this weirdo pops up in two places ... */ @@ -56,33 +56,31 @@ extern "C" { /* INTEGER CODES */ #ifdef __BIG_ENDIAN__ - /* Big Endian */ -# define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) ) +/* Big Endian */ +# define MAKE_ID(a, b, c, d) ( (int)(a) << 24 | (int)(b) << 16 | (c) << 8 | (d) ) #else - /* Little Endian */ -# define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) ) +/* Little Endian */ +# define MAKE_ID(a, b, c, d) ( (int)(d) << 24 | (int)(c) << 16 | (b) << 8 | (a) ) #endif -#define ID_NEW(a) if( (a) && (a)->id.newid ) (a)= (void *)(a)->id.newid +#define DATA MAKE_ID('D', 'A', 'T', 'A') +#define GLOB MAKE_ID('G', 'L', 'O', 'B') -#define DATA MAKE_ID('D','A','T','A') -#define GLOB MAKE_ID('G','L','O','B') +#define DNA1 MAKE_ID('D', 'N', 'A', '1') +#define TEST MAKE_ID('T', 'E', 'S', 'T') /* used as preview between 'REND' and 'GLOB' */ +#define REND MAKE_ID('R', 'E', 'N', 'D') +#define USER MAKE_ID('U', 'S', 'E', 'R') -#define DNA1 MAKE_ID('D','N','A','1') -#define TEST MAKE_ID('T','E','S','T') /* used as preview between 'REND' and 'GLOB' */ -#define REND MAKE_ID('R','E','N','D') -#define USER MAKE_ID('U','S','E','R') - -#define ENDB MAKE_ID('E','N','D','B') +#define ENDB MAKE_ID('E', 'N', 'D', 'B') /* Bit operations */ -#define BTST(a,b) ( ( (a) & 1<<(b) )!=0 ) -#define BNTST(a,b) ( ( (a) & 1<<(b) )==0 ) -#define BTST2(a,b,c) ( BTST( (a), (b) ) || BTST( (a), (c) ) ) -#define BSET(a,b) ( (a) | 1<<(b) ) -#define BCLR(a,b) ( (a) & ~(1<<(b)) ) +#define BTST(a, b) ( ( (a) & 1 << (b) ) != 0) +#define BNTST(a, b) ( ( (a) & 1 << (b) ) == 0) +#define BTST2(a, b, c) (BTST( (a), (b) ) || BTST( (a), (c) ) ) +#define BSET(a, b) ( (a) | 1 << (b) ) +#define BCLR(a, b) ( (a) & ~(1 << (b)) ) /* bit-row */ -#define BROW(min, max) (((max)>=31? 0xFFFFFFFF: (1<<(max+1))-1) - ((min)? ((1<<(min))-1):0) ) +#define BROW(min, max) (((max) >= 31 ? 0xFFFFFFFF : (1 << (max + 1)) - 1) - ((min) ? ((1 << (min)) - 1) : 0) ) #ifdef __cplusplus } |