diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 08:01:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 08:06:37 +0300 |
| commit | b21007757fd642a1c77ff7081832d93b3282a34b (patch) | |
| tree | c07777b3d00441f84d02bd612ad55a7d0bea50e2 /source/blender/draw/modes/edit_mesh_mode.c | |
| parent | cdda910fc321ab03d21434b5015dae41b8e7720b (diff) | |
DRW: disable wide edges when face-dots are used
Users who prefer to use face dot's don't get an advantage from drawing
thicker wire.
Requested by @ward
Diffstat (limited to 'source/blender/draw/modes/edit_mesh_mode.c')
| -rw-r--r-- | source/blender/draw/modes/edit_mesh_mode.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c index f8bc4ecbf9e..d599e390ca7 100644 --- a/source/blender/draw/modes/edit_mesh_mode.c +++ b/source/blender/draw/modes/edit_mesh_mode.c @@ -274,6 +274,8 @@ static DRWPass *edit_mesh_create_overlay_pass( const bool select_vert = (tsettings->selectmode & SCE_SELECT_VERTEX) != 0; const bool select_face = (tsettings->selectmode & SCE_SELECT_FACE) != 0; const bool select_edge = (tsettings->selectmode & SCE_SELECT_EDGE) != 0; + const bool show_wide_edge = select_edge && !(draw_ctx->v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_FACE_DOT); + float winmat[4][4]; float viewdist = rv3d->dist; DRW_viewport_matrix_get(winmat, DRW_MAT_WIN); @@ -326,7 +328,7 @@ static DRWPass *edit_mesh_create_overlay_pass( DRW_shgroup_uniform_ivec4(grp, "dataMask", data_mask, 1); DRW_shgroup_uniform_bool_copy(grp, "doEdges", do_edges); DRW_shgroup_uniform_float_copy(grp, "ofs", depth_ofs); - DRW_shgroup_uniform_float_copy(grp, "edgeScale", select_edge ? 1.75f : 1.0f); + DRW_shgroup_uniform_float_copy(grp, "edgeScale", show_wide_edge ? 1.75f : 1.0f); DRW_shgroup_state_enable(grp, DRW_STATE_OFFSET_NEGATIVE); /* To match blender loop structure. */ DRW_shgroup_state_enable(grp, DRW_STATE_FIRST_VERTEX_CONVENTION); |