From 72e04f98909c0970c82c3e708b0c651553487693 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 5 Jul 2018 20:27:04 +0200 Subject: Draw Manager: simplify object mask usage Remove flag defines, use object types directly. --- source/blender/makesdna/DNA_view3d_types.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'source/blender/makesdna/DNA_view3d_types.h') diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index c1244e9a0c7..5668cf24fe6 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -179,7 +179,7 @@ typedef struct View3DOverlay { /* Other settings */ float wireframe_threshold; - int hidden_object_types; + int object_type_exclude; } View3DOverlay; @@ -384,18 +384,6 @@ enum { V3D_OVERLAY_ONION_SKINS = (1 << 7), }; -/* View3DOverlay->hidden_object_types */ -enum { - V3D_OVERLAY_HIDE_EMPTY = (1 << OB_EMPTY), - V3D_OVERLAY_HIDE_LAMP = (1 << OB_LAMP), - V3D_OVERLAY_HIDE_CAMERA = (1 << OB_CAMERA), - V3D_OVERLAY_HIDE_SPEAKER = (1 << OB_SPEAKER), - V3D_OVERLAY_HIDE_LIGHTPROBE = (1 << OB_LIGHTPROBE), - V3D_OVERLAY_HIDE_ARMATURE = (1 << OB_ARMATURE), - V3D_OVERLAY_HIDE_OTHER = (1 << 14), -}; -#define V3D_OVERLAY_HIDE_NON_RENDERABLE (V3D_OVERLAY_HIDE_EMPTY | V3D_OVERLAY_HIDE_LAMP | V3D_OVERLAY_HIDE_CAMERA | V3D_OVERLAY_HIDE_SPEAKER | V3D_OVERLAY_HIDE_LIGHTPROBE | V3D_OVERLAY_HIDE_ARMATURE | V3D_OVERLAY_HIDE_OTHER) - /* View3DOverlay->edit_flag */ enum { V3D_OVERLAY_EDIT_VERT_NORMALS = (1 << 0), -- cgit v1.2.3