diff options
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 47fd1a4e07c..a0b0cbea4c3 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -873,15 +873,13 @@ typedef struct GameData { /* GameData.matmode */ enum { +#ifdef DNA_DEPRECATED GAME_MAT_TEXFACE = 0, /* deprecated */ +#endif GAME_MAT_MULTITEX = 1, GAME_MAT_GLSL = 2, }; -#if (DNA_DEPRECATED_GCC_POISON == 1) -#pragma GCC poison GAME_MAT_TEXFACE -#endif - /* GameData.lodflag */ #define SCE_LOD_USE_HYST (1 << 0) @@ -1578,12 +1576,7 @@ enum { /*R_COLOR_MANAGEMENT_PREDIVIDE = (1 << 1)*/ /* deprecated, shouldn't be used */ }; -#if 0 /* TODO */ -#if (DNA_DEPRECATED_GCC_POISON == 1) -#pragma GCC poison R_COLOR_MANAGEMENT -#endif -#endif - +#ifdef DNA_DEPRECATED /* subimtype, flag options for imtype */ enum { R_OPENEXR_HALF = 1, /*deprecated*/ @@ -1598,10 +1591,6 @@ enum { R_JPEG2K_CINE_PRESET = 256, /*deprecated*/ R_JPEG2K_CINE_48FPS = 512, /*deprecated*/ }; - -#if (DNA_DEPRECATED_GCC_POISON == 1) -#pragma GCC poison R_OPENEXR_HALF R_OPENEXR_ZBUF R_PREVIEW_JPG R_CINEON_LOG R_TIFF_16BIT -#pragma GCC poison R_JPEG2K_12BIT R_JPEG2K_16BIT R_JPEG2K_YCC R_JPEG2K_CINE_PRESET R_JPEG2K_CINE_48FPS #endif /* bake_mode: same as RE_BAKE_xxx defines */ @@ -1807,16 +1796,13 @@ typedef enum eVGroupSelect { #define AUDIO_VOLUME_ANIMATED (1<<3) enum { +#ifdef DNA_DEPRECATED FFMPEG_MULTIPLEX_AUDIO = 1, /* deprecated, you can choose none as audiocodec now */ +#endif FFMPEG_AUTOSPLIT_OUTPUT = 2, FFMPEG_LOSSLESS_OUTPUT = 4, }; -#if (DNA_DEPRECATED_GCC_POISON == 1) -#pragma GCC poison FFMPEG_MULTIPLEX_AUDIO -#endif - - /* Paint.flags */ typedef enum { PAINT_SHOW_BRUSH = (1 << 0), @@ -1839,10 +1825,12 @@ typedef enum SymmetryFlags { /* Sculpt.flags */ /* These can eventually be moved to paint flags? */ typedef enum SculptFlags { +#ifdef DNA_DEPRECATED /* deprecated, part of paint struct symmetry_flags now */ SCULPT_SYMM_X = (1 << 0), SCULPT_SYMM_Y = (1 << 1), SCULPT_SYMM_Z = (1 << 2), +#endif SCULPT_LOCK_X = (1 << 3), SCULPT_LOCK_Y = (1 << 4), @@ -1873,11 +1861,6 @@ typedef enum ImagePaintMode { IMAGEPAINT_MODE_IMAGE, /* select texture paint image directly */ } ImagePaintMode; -#if (DNA_DEPRECATED_GCC_POISON == 1) -#pragma GCC poison SCULPT_SYMM_X SCULPT_SYMM_Y SCULPT_SYMM_Z SCULPT_SYMMETRY_FEATHER -#endif - - /* ImagePaintSettings.flag */ #define IMAGEPAINT_DRAWING 1 // #define IMAGEPAINT_DRAW_TOOL 2 // deprecated |