diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-04 17:14:47 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-04 17:15:23 +0300 |
| commit | 3b3e6127520de14e2cf92f371281f66ebcec3756 (patch) | |
| tree | bfc72e8dda651f793545d01ae206ec14567eaff5 /source/blender/editors | |
| parent | 6a6aeaac7d32245aa17ba8c0f2a3886c329cb111 (diff) | |
| parent | 0f8228a890c3b0906d88e34ac75d0246a65dfe55 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 0a0a8ff2de3..a075ed657d1 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -1583,9 +1583,17 @@ static bool mouse_mesh_loop(bContext *C, const int mval[2], bool extend, bool de mvalf[1] = (float)(vc.mval[1] = mval[1]); em = vc.em; + /* Make sure that the edges are also considered for selection. + * TODO: cleanup: add `selectmode` as a parameter */ + const short ts_selectmode = vc.scene->toolsettings->selectmode; + vc.scene->toolsettings->selectmode |= SCE_SELECT_EDGE; + /* no afterqueue (yet), so we check it now, otherwise the bm_xxxofs indices are bad */ ED_view3d_backbuf_validate(&eval_ctx, &vc); + /* restore `selectmode` */ + vc.scene->toolsettings->selectmode = ts_selectmode; + eed = EDBM_edge_find_nearest_ex(&eval_ctx, &vc, &dist, NULL, true, true, NULL); if (eed == NULL) { return false; diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 3e7e617bd0e..b06c0031e71 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -9772,9 +9772,11 @@ void draw_object_backbufsel( ED_view3d_polygon_offset(rv3d, 1.0); - /* we draw edges always, for loop (select) tools */ - bbs_mesh_wire(em, dm, bm_solidoffs); - bm_wireoffs = bm_solidoffs + em->bm->totedge; + /* we draw edges if edge select mode */ + if (ts->selectmode & SCE_SELECT_EDGE) { + bbs_mesh_wire(em, dm, bm_solidoffs); + bm_wireoffs = bm_solidoffs + em->bm->totedge; + } /* we draw verts if vert select mode. */ if (ts->selectmode & SCE_SELECT_VERTEX) { |