diff options
| author | Joshua Leung <aligorith@gmail.com> | 2008-09-05 10:05:25 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2008-09-05 10:05:25 +0400 |
| commit | 18fe6c27ff2b4a76ec5c646a3dda0a7bd64d94b4 (patch) | |
| tree | 4d274bf759cb3f65bff2e1e5906784667f228e21 /source/blender/makesdna/DNA_ipo_types.h | |
| parent | 18b5b4ff0c270c328f0fe30e0af9a7ff178247eb (diff) | |
Compiling/Warning Fixes (for scons/mingw + "split sources hack") Part 1:
* Removed compiler warnings from texteditor work
* Added round brackets around the new defines for IPO channels for extra texture layers
* Tweaked priorities so that BLI_heap_* functions in blenlib can be found by linker (split-sources specific)
TODO:
* "monkey*" vars cannot be found still
Diffstat (limited to 'source/blender/makesdna/DNA_ipo_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_ipo_types.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h index e7f46b81935..2659de2f067 100644 --- a/source/blender/makesdna/DNA_ipo_types.h +++ b/source/blender/makesdna/DNA_ipo_types.h @@ -142,24 +142,24 @@ typedef short IPO_Channel; #define MA_FRESTRAI 25 #define MA_ADD 26 -#define MA_MAP1 1<<5 -#define MA_MAP2 1<<6 -#define MA_MAP3 1<<7 -#define MA_MAP4 1<<8 -#define MA_MAP5 1<<9 -#define MA_MAP6 1<<10 -#define MA_MAP7 1<<11 -#define MA_MAP8 1<<12 -#define MA_MAP9 1<<13 -#define MA_MAP10 1<<14 -#define MA_MAP11 1<<15 -#define MA_MAP12 1<<16 -#define MA_MAP13 1<<17 -#define MA_MAP14 1<<18 -#define MA_MAP15 1<<19 -#define MA_MAP16 1<<20 -#define MA_MAP17 1<<21 -#define MA_MAP18 1<<22 +#define MA_MAP1 (1<<5) +#define MA_MAP2 (1<<6) +#define MA_MAP3 (1<<7) +#define MA_MAP4 (1<<8) +#define MA_MAP5 (1<<9) +#define MA_MAP6 (1<<10) +#define MA_MAP7 (1<<11) +#define MA_MAP8 (1<<12) +#define MA_MAP9 (1<<13) +#define MA_MAP10 (1<<14) +#define MA_MAP11 (1<<15) +#define MA_MAP12 (1<<16) +#define MA_MAP13 (1<<17) +#define MA_MAP14 (1<<18) +#define MA_MAP15 (1<<19) +#define MA_MAP16 (1<<20) +#define MA_MAP17 (1<<21) +#define MA_MAP18 (1<<22) #define TEX_TOTNAM 14 |