blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Fix T55184: Edge-loop select fails w/ vert/face modes

This commit is contained in:
Campbell Barton 2018-05-24 19:30:01 +02:00
parent 0983d97ab9
commit d209fa6e35
Notes: blender-bot 2023-02-14 05:50:07 +01:00 
Referenced by issue #55184, Edge loop not working for vertex and face
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/mesh/editmesh_select.c
View File

@ -1706,15 +1706,23 @@ static bool mouse_mesh_loop(bContext *C, const int mval[2], bool extend, bool de
/* 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(&vc);
/* restore `selectmode` */
vc.scene->toolsettings->selectmode = ts_selectmode;
bool use_fake_edge_mode = false;
if (ts_selectmode & SCE_SELECT_EDGE) {
vc.v3d->flag |= V3D_INVALID_BACKBUF;
vc.scene->toolsettings->selectmode |= SCE_SELECT_EDGE;
em->selectmode = vc.scene->toolsettings->selectmode;
use_fake_edge_mode = true;
}
eed = EDBM_edge_find_nearest_ex(&vc, &dist, NULL, true, true, NULL);
/* restore `selectmode` */
if (use_fake_edge_mode) {
vc.v3d->flag |= V3D_INVALID_BACKBUF;
vc.scene->toolsettings->selectmode = ts_selectmode;
em->selectmode = ts_selectmode;
}
if (eed == NULL) {
return false;
}