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_mesh_types.h | 51 +++++--------------------------- 1 file changed, 7 insertions(+), 44 deletions(-) (limited to 'source/blender/makesdna/DNA_mesh_types.h') diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index fda18e5cbd6..9a91d3a0998 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -172,10 +172,8 @@ typedef struct Mesh { float size[3]; float rot[3]; - int drawflag; short texflag, flag; float smoothresh; - int pad2; /* customdata flag, for bevel-weight and crease, which are now optional */ char cd_flag, pad; @@ -230,15 +228,15 @@ enum { /* me->flag */ enum { -/* ME_ISDONE = 1 << 0, */ -/* ME_DEPRECATED = 1 << 1, */ + ME_FLAG_DEPRECATED_0 = 1 << 0, /* cleared */ + ME_FLAG_DEPRECATED_1 = 1 << 1, /* cleared */ ME_TWOSIDED = 1 << 2, - ME_UVEFFECT = 1 << 3, - ME_VCOLEFFECT = 1 << 4, + ME_FLAG_DEPRECATED_3 = 1 << 3, /* cleared */ + ME_FLAG_DEPRECATED_4 = 1 << 4, /* cleared */ ME_AUTOSMOOTH = 1 << 5, - ME_SMESH = 1 << 6, - ME_SUBSURF = 1 << 7, - ME_OPT_EDGES = 1 << 8, + ME_FLAG_DEPRECATED_6 = 1 << 6, /* cleared */ + ME_FLAG_DEPRECATED_7 = 1 << 7, /* cleared */ + ME_FLAG_DEPRECATED_8 = 1 << 8, /* cleared */ ME_DS_EXPAND = 1 << 9, ME_SCULPT_DYNAMIC_TOPOLOGY = 1 << 10, }; @@ -250,41 +248,6 @@ enum { ME_CDFLAG_EDGE_CREASE = 1 << 2, }; -#if 0 /* Was moved to overlay options for 2.8 */ -/* me->drawflag, short */ -enum { - ME_DRAWEDGES = 1 << 0, - ME_DRAWFACES = 1 << 1, - ME_DRAWNORMALS = 1 << 2, - ME_DRAW_VNORMALS = 1 << 3, - - ME_DRAWEIGHT = 1 << 4, - ME_DRAW_FACE_DOT = 1 << 5, - - ME_DRAWCREASES = 1 << 6, - ME_DRAWSEAMS = 1 << 7, - ME_DRAWSHARP = 1 << 8, - ME_DRAWBWEIGHTS = 1 << 9, - - ME_DRAWEXTRA_EDGELEN = 1 << 10, - ME_DRAWEXTRA_FACEAREA = 1 << 11, - ME_DRAWEXTRA_FACEANG = 1 << 12, - ME_DRAWEXTRA_EDGEANG = 1 << 13, - -/* debug only option */ - ME_DRAWEXTRA_INDICES = 1 << 14, - - ME_DRAW_FREESTYLE_EDGE = 1 << 15, - ME_DRAW_FREESTYLE_FACE = 1 << 16, - -/* draw stats */ - ME_DRAW_STATVIS = 1 << 17, - -/* draw loop normals */ - ME_DRAW_LNORMALS = 1 << 18, -}; -#endif - /* Subsurf Type */ enum { ME_CC_SUBSURF = 0, -- cgit v1.2.3