diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-12-17 01:42:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-12-17 01:49:23 +0300 |
| commit | 96ebdbc90ff93f55e202997334ef3ff811f497fb (patch) | |
| tree | f46426f457b80991250e98c1a580fa3b064ff336 /source/blender/makesdna/DNA_scene_types.h | |
| parent | bcd38b398ce19a1757ab1f7f51ef50df8eef8d41 (diff) | |
Fix deprecated DNA define checks
Also remove dead code which checked for SPACE_TIME.
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 980fbfa72e0..7cfd19b4bd9 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -101,7 +101,7 @@ typedef struct AviCodecData { typedef enum eFFMpegPreset { FFM_PRESET_NONE, -#ifdef DNA_DEPRECATED +#ifdef DNA_DEPRECATED_ALLOW /* Previously used by h.264 to control encoding speed vs. file size. */ FFM_PRESET_ULTRAFAST, /* DEPRECATED */ FFM_PRESET_SUPERFAST, /* DEPRECATED */ @@ -1929,7 +1929,7 @@ enum { R_COLOR_MANAGEMENT_UNUSED_1 = (1 << 1), }; -#ifdef DNA_DEPRECATED +#ifdef DNA_DEPRECATED_ALLOW /* RenderData.subimtype flag options for imtype */ enum { R_OPENEXR_HALF = (1 << 0), /*deprecated*/ @@ -2169,7 +2169,7 @@ typedef enum eVGroupSelect { /* FFMpegCodecData.flags */ enum { -#ifdef DNA_DEPRECATED +#ifdef DNA_DEPRECATED_ALLOW FFMPEG_MULTIPLEX_AUDIO = (1 << 0), /* deprecated, you can choose none as audiocodec now */ #endif FFMPEG_AUTOSPLIT_OUTPUT = (1 << 1), |