blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix T38655: Face path select fails with edge/vert select enabled too

This commit is contained in:
Campbell Barton 2014-02-18 08:21:19 +11:00
parent 1a4b718582
commit 13870d5177
Notes: blender-bot 2023-02-14 11:11:01 +01:00 
Referenced by issue #38655, Face path select fails with multiple selection methods enabled
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/mesh/editmesh_path.c
View File

@ -449,14 +449,21 @@ static int edbm_shortest_path_pick_invoke(bContext *C, wmOperator *UNUSED(op), c
{
ViewContext vc;
BMEditMesh *em;
BMElem *ele;
view3d_operator_needs_opengl(C);
em_setup_viewcontext(C, &vc);
copy_v2_v2_int(vc.mval, event->mval);
em = vc.em;
if (em->selectmode & SCE_SELECT_VERTEX) {
ele = BM_mesh_active_elem_get(em->bm);
if (ele == NULL) {
return OPERATOR_PASS_THROUGH;
}
view3d_operator_needs_opengl(C);
if ((em->selectmode & SCE_SELECT_VERTEX) && (ele->head.htype == BM_VERT)) {
if (mouse_mesh_shortest_path_vert(&vc)) {
return OPERATOR_FINISHED;
}
@ -464,7 +471,7 @@ static int edbm_shortest_path_pick_invoke(bContext *C, wmOperator *UNUSED(op), c
return OPERATOR_PASS_THROUGH;
}
}
else if (em->selectmode & SCE_SELECT_EDGE) {
else if ((em->selectmode & SCE_SELECT_EDGE) && (ele->head.htype == BM_EDGE)) {
if (mouse_mesh_shortest_path_edge(&vc)) {
return OPERATOR_FINISHED;
}
@ -472,7 +479,7 @@ static int edbm_shortest_path_pick_invoke(bContext *C, wmOperator *UNUSED(op), c
return OPERATOR_PASS_THROUGH;
}
}
else if (em->selectmode & SCE_SELECT_FACE) {
else if ((em->selectmode & SCE_SELECT_FACE) && (ele->head.htype == BM_FACE)) {
if (mouse_mesh_shortest_path_face(&vc)) {
return OPERATOR_FINISHED;
}