Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-07-05 21:27:04 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-07-05 21:43:50 +0300
commit72e04f98909c0970c82c3e708b0c651553487693 (patch)
tree810994a4668e46fa08b89f70057286d3b4014637 /source/blender/makesdna/DNA_view3d_types.h
parente5ca319f9db4de752fe7628807d7a1edad2389c0 (diff)
Draw Manager: simplify object mask usage
Remove flag defines, use object types directly.
Diffstat (limited to 'source/blender/makesdna/DNA_view3d_types.h')
-rw-r--r--source/blender/makesdna/DNA_view3d_types.h14
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 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),