diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-07-05 17:51:49 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-07-05 17:51:49 +0300 |
| commit | c1678a3723471fe2345c23afb439f6aa8d1a6ef5 (patch) | |
| tree | 0c9b79d9de3b2a4af1cee1b0795e4953a7a920d6 /source/blender/makesdna/DNA_view3d_types.h | |
| parent | f7ec70895c78900db8e7db88d3713ebb9aa62730 (diff) | |
Revert "Overlay: enable/disable drawing of specific object types."
This reverts commit f7ec70895c78900db8e7db88d3713ebb9aa62730.
Diffstat (limited to 'source/blender/makesdna/DNA_view3d_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index f7fd4a52a5f..70f06b2eda0 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -49,7 +49,6 @@ struct GPUViewport; #include "DNA_defs.h" #include "DNA_listBase.h" #include "DNA_image_types.h" -#include "DNA_object_types.h" #include "DNA_movieclip_types.h" #include "DNA_gpu_types.h" @@ -179,8 +178,8 @@ typedef struct View3DOverlay { /* Other settings */ float wireframe_threshold; - int visible_object_types; + int pad; } View3DOverlay; /* 3D ViewPort Struct */ @@ -384,17 +383,6 @@ enum { V3D_OVERLAY_ONION_SKINS = (1 << 7), }; -/* View3DOverlay->visible_object_types */ -enum { - V3D_OVERLAY_SHOW_EMPTY = (1 << OB_EMPTY), - V3D_OVERLAY_SHOW_LAMP = (1 << OB_LAMP), - V3D_OVERLAY_SHOW_CAMERA = (1 << OB_CAMERA), - V3D_OVERLAY_SHOW_SPEAKER = (1 << OB_SPEAKER), - V3D_OVERLAY_SHOW_LIGHTPROBE = (1 << OB_LIGHTPROBE), - V3D_OVERLAY_SHOW_ARMATURE = (1 << OB_ARMATURE), -}; -#define V3D_OVERLAY_VISIBLE_OBJECT_TYPES_MASK (V3D_OVERLAY_SHOW_EMPTY | V3D_OVERLAY_SHOW_LAMP | V3D_OVERLAY_SHOW_CAMERA | V3D_OVERLAY_SHOW_SPEAKER | V3D_OVERLAY_SHOW_LIGHTPROBE | V3D_OVERLAY_SHOW_ARMATURE) - /* View3DOverlay->edit_flag */ enum { V3D_OVERLAY_EDIT_VERT_NORMALS = (1 << 0), |