diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-08-04 11:52:51 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-08-04 11:55:05 +0300 |
| commit | cb67bfdba2e22d0ee967e50afe0912ac80d73e9b (patch) | |
| tree | 73062214d0be9135b3b56a863a68d1732523daa5 /source/blender/makesdna | |
| parent | 218df9941097bf973485ac343c070bdc6641a539 (diff) | |
Viewport normal drawing with constant length
Patch for: T37878
{F10169694}
Reviewed By: fclem
Differential Revision: https://developer.blender.org/D11487
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_defaults.h | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h.rej | 9 |
3 files changed, 14 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_view3d_defaults.h b/source/blender/makesdna/DNA_view3d_defaults.h index 9dfc37e57b1..c4d0c83b346 100644 --- a/source/blender/makesdna/DNA_view3d_defaults.h +++ b/source/blender/makesdna/DNA_view3d_defaults.h @@ -71,6 +71,7 @@ .gpencil_paper_opacity = 0.5f, \ .gpencil_grid_opacity = 0.9f, \ .gpencil_vertex_paint_opacity = 1.0f, \ + .normals_constant_screen_size = 7.0f, \ } #define _DNA_DEFAULT_View3DCursor \ diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 08b29c82707..4d88f6f0c15 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -204,6 +204,7 @@ typedef struct View3DOverlay { /** Edit mode settings. */ int edit_flag; float normals_length; + float normals_constant_screen_size; float backwire_opacity; /** Paint mode settings. */ @@ -238,6 +239,8 @@ typedef struct View3DOverlay { float gpencil_vertex_paint_opacity; /** Handles display type for curves. */ int handle_display; + + char _pad[4]; } View3DOverlay; /* View3DOverlay->handle_display */ @@ -551,6 +554,7 @@ enum { // V3D_OVERLAY_EDIT_CU_HANDLES = (1 << 20), V3D_OVERLAY_EDIT_CU_NORMALS = (1 << 21), + V3D_OVERLAY_EDIT_CONSTANT_SCREEN_SIZE_NORMALS = (1 << 22), }; /** #View3DOverlay.paint_flag */ diff --git a/source/blender/makesdna/DNA_view3d_types.h.rej b/source/blender/makesdna/DNA_view3d_types.h.rej new file mode 100644 index 00000000000..a62f1c4b7d3 --- /dev/null +++ b/source/blender/makesdna/DNA_view3d_types.h.rej @@ -0,0 +1,9 @@ +diff a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h (rejected hunks) +@@ -550,6 +553,7 @@ + /* V3D_OVERLAY_EDIT_CU_HANDLES = (1 << 20), */ + + V3D_OVERLAY_EDIT_CU_NORMALS = (1 << 21), ++ V3D_OVERLAY_EDIT_CONSTANT_SCREEN_SIZE_NORMALS = (1 << 22), + }; + + /** #View3DOverlay.paint_flag */ |