From d72d2d4133ba578ee29e65cc99b01fab0ded0265 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 17 Dec 2018 13:21:49 +1100 Subject: DNA: clear / remove deprecated flags - Clear deprecated flags for ID's: Scene, Sequence, World, Object & Mesh. - Clear deprecated flags for Spaces: outliner, 3D view & image. - Remove unused `Mesh.drawflag` - Remove unused `USER_ALLWINCODECS`, `USER_MMB_PASTE`. - Remove `V3D_SOLID_TEX` & `V3D_ZBUF_SELECT` - used in a few areas. - Flip `Object.empty_image_visibility_flag` (avoids do-version on each new flag) - Rename 'Backside' -> 'Back' in context of drawing - showing 'Back' makes sense. --- source/blender/makesdna/DNA_sequence_types.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'source/blender/makesdna/DNA_sequence_types.h') diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 2e6aa25ad9b..f44c9675e86 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -399,23 +399,22 @@ typedef struct SequencerScopes { #define SEQ_EDIT_PROXY_DIR_STORAGE 1 /* SpeedControlVars->flags */ -#define SEQ_SPEED_INTEGRATE 1 -/* #define SEQ_SPEED_BLEND 2 */ /* DEPRECATED */ -#define SEQ_SPEED_COMPRESS_IPO_Y 4 +#define SEQ_SPEED_INTEGRATE (1 << 0) +#define SEQ_SPEED_DEPRECATED_1 (1 << 1) /* cleared */ +#define SEQ_SPEED_COMPRESS_IPO_Y (1 << 2) /* ***************** SEQUENCE ****************** */ #define SEQ_NAME_MAXSTR 64 /* seq->flag */ enum { + /* SELECT */ SEQ_LEFTSEL = (1 << 1), SEQ_RIGHTSEL = (1 << 2), SEQ_OVERLAP = (1 << 3), SEQ_FILTERY = (1 << 4), SEQ_MUTE = (1 << 5), -#ifdef DNA_DEPRECATED - SEQ_MAKE_PREMUL = (1 << 6), /* deprecated, used for compatibility code only */ -#endif + SEQ_FLAG_DEPRECATED_6 = (1 << 6), /* cleared */ SEQ_REVERSE_FRAMES = (1 << 7), SEQ_IPO_FRAME_LOCKED = (1 << 8), SEQ_EFFECT_NOT_LOADED = (1 << 9), @@ -427,10 +426,10 @@ enum { SEQ_USE_PROXY = (1 << 15), SEQ_USE_TRANSFORM = (1 << 16), SEQ_USE_CROP = (1 << 17), - /* SEQ_USE_COLOR_BALANCE = (1 << 18), */ /* DEPRECATED */ - /* SEQ_USE_PROXY_CUSTOM_DIR = (1 << 19), */ /* DEPRECATED */ + SEQ_FLAG_DEPRECATED_18 = (1 << 18), /* cleared */ + SEQ_FLAG_DEPRECATED_19 = (1 << 19), /* cleared */ + SEQ_FLAG_DEPRECATED_21 = (1 << 21), /* cleared */ - /* SEQ_USE_PROXY_CUSTOM_FILE = (1 << 21), */ /* DEPRECATED */ SEQ_USE_EFFECT_DEFAULT_FADE = (1 << 22), SEQ_USE_LINEAR_MODIFIERS = (1 << 23), -- cgit v1.2.3