diff options
| author | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
|---|---|---|
| committer | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
| commit | 2658a3c1b44717f497f187a38000c804eb37bbba (patch) | |
| tree | ee55c673feabced8b6ec8bf9a8aa4d82a3cda3db /source/blender/makesdna/DNA_sound_types.h | |
| parent | 4005cb1c6a63a217df0e887c741beee2c1359301 (diff) | |
| parent | 09b859d03f0ee138c4273ef8460e91d9888387a1 (diff) | |
Merge branch 'master' into soc-2013-sketch_meshsoc-2013-sketch_mesh
Conflicts:
release/scripts/addons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
Diffstat (limited to 'source/blender/makesdna/DNA_sound_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_sound_types.h | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index 040942d6cea..d7a51359777 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -33,6 +33,7 @@ #ifndef __DNA_SOUND_TYPES_H__ #define __DNA_SOUND_TYPES_H__ +#include "DNA_defs.h" #include "DNA_ID.h" /* stupid... could easily be solved */ @@ -109,14 +110,21 @@ typedef enum eSound_Type { #endif /* spacesound->flag */ -#define SND_DRAWFRAMES 1 -#define SND_CFRA_NUM 2 - -#define SOUND_FLAGS_3D (1 << 3) /* deprecated! used for sound actuator loading */ -#define SOUND_FLAGS_CACHING (1 << 4) -#define SOUND_FLAGS_MONO (1 << 5) +enum { + SND_DRAWFRAMES = 1, + SND_CFRA_NUM = 2, +}; + +enum { + SOUND_FLAGS_3D = (1 << 3), /* deprecated! used for sound actuator loading */ + SOUND_FLAGS_CACHING = (1 << 4), + SOUND_FLAGS_MONO = (1 << 5), +}; + +#if (DNA_DEPRECATED_GCC_POISON == 1) +#pragma GCC poison SOUND_FLAGS_3D +#endif /* to DNA_sound_types.h*/ #endif - |