diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-09-25 00:18:02 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-09-25 23:51:54 +0300 |
| commit | a3bb385ca0ba37bf1cdc1b74de9ce872b262fb95 (patch) | |
| tree | 250974f326d38cf9bebec98ad5b79a2fb64add10 /source/blender/makesdna | |
| parent | 7cc9998809359dead38bd20de851494e11ab3da1 (diff) | |
Edit Mesh: Move Edit Mesh display settings to overlay's
This makes the Edit Mesh display settings common to all objects. They can
also be set differently per viewport.
Modifying extra data (seams, sharp edges etc...) will no longer set them
automaticaly visible.
Bumping version because we need to force set all extra draw options for
older files.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 19 |
3 files changed, 23 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 816a589ee16..e8eb59cb5e0 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -238,6 +238,7 @@ 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, @@ -270,6 +271,7 @@ enum { /* draw loop normals */ ME_DRAW_LNORMALS = 1 << 18, }; +#endif /* Subsurf Type */ enum { diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index d85704d9c7a..05ff65f0267 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -997,6 +997,8 @@ typedef enum eSpaceImage_Flag { SI_SHOW_R = (1 << 27), SI_SHOW_G = (1 << 28), SI_SHOW_B = (1 << 29), + + SI_NO_DRAWEDGES = (1 << 30), } eSpaceImage_Flag; /* SpaceImage.other_uv_filter */ diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 7620d674b1e..32c61cbefb8 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -429,6 +429,25 @@ enum { V3D_OVERLAY_EDIT_OCCLUDE_WIRE = (1 << 3), V3D_OVERLAY_EDIT_WEIGHT = (1 << 4), + + V3D_OVERLAY_EDIT_EDGES = (1 << 5), + V3D_OVERLAY_EDIT_FACES = (1 << 6), + V3D_OVERLAY_EDIT_FACE_DOT = (1 << 7), + + V3D_OVERLAY_EDIT_SEAMS = (1 << 8), + V3D_OVERLAY_EDIT_SHARP = (1 << 9), + V3D_OVERLAY_EDIT_CREASES = (1 << 10), + V3D_OVERLAY_EDIT_BWEIGHTS = (1 << 11), + + V3D_OVERLAY_EDIT_FREESTYLE_EDGE = (1 << 12), + V3D_OVERLAY_EDIT_FREESTYLE_FACE = (1 << 13), + + V3D_OVERLAY_EDIT_STATVIS = (1 << 14), + V3D_OVERLAY_EDIT_EDGE_LEN = (1 << 15), + V3D_OVERLAY_EDIT_EDGE_ANG = (1 << 16), + V3D_OVERLAY_EDIT_FACE_ANG = (1 << 17), + V3D_OVERLAY_EDIT_FACE_AREA = (1 << 18), + V3D_OVERLAY_EDIT_INDICES = (1 << 19), }; /* View3DOverlay->arm_flag */ |