griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T64687: Loop select work only with edges

Browse Source 
Regression in recent commit 8a6414ed46
This commit is contained in:
Campbell Barton
2019-05-16 20:26:30 +10:00
parent fced0f0437
commit f30921fc68
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1168,9 +1168,8 @@ static bool unified_findnearest(ViewContext *vc,
} hit = {{NULL}};
/* no afterqueue (yet), so we check it now, otherwise the em_xxxofs indices are bad */
short selectmode = vc->scene->toolsettings->selectmode;
if ((dist > 0.0f) && (selectmode & SCE_SELECT_FACE)) {
if ((dist > 0.0f) && (em->selectmode & SCE_SELECT_FACE)) {
float dist_center = 0.0f;
float *dist_center_p = (em->selectmode & (SCE_SELECT_EDGE | SCE_SELECT_VERTEX)) ?
&dist_center :
@@ -1194,7 +1193,7 @@ static bool unified_findnearest(ViewContext *vc,
}
}
if ((dist > 0.0f) && (selectmode & SCE_SELECT_EDGE)) {
if ((dist > 0.0f) && (em->selectmode & SCE_SELECT_EDGE)) {
float dist_center = 0.0f;
float *dist_center_p = (em->selectmode & SCE_SELECT_VERTEX) ? &dist_center : NULL;
@@ -1216,7 +1215,7 @@ static bool unified_findnearest(ViewContext *vc,
}
}
if ((dist > 0.0f) && (selectmode & SCE_SELECT_VERTEX)) {
if ((dist > 0.0f) && (em->selectmode & SCE_SELECT_VERTEX)) {
uint base_index = 0;
BMVert *eve_test = EDBM_vert_find_nearest_ex(
vc, &dist, true, use_cycle, bases, bases_len, &base_index);