From 36593405713745854f4da933282ca3c3a5041063 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 29 Mar 2021 16:45:37 +1100 Subject: Cleanup: logical error in path select picking Resolve logical error in edbm_shortest_path_pick_invoke where any discrepancy between EDBM_unified_findnearest and edbm_elem_find_nearest caused the active-object to be cleared. While it's not a problem at the moment, using a larger threshold for path picking exposes the error. --- source/blender/editors/mesh/editmesh_path.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/mesh/editmesh_path.c') diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c index 2cb8da37260..b7f671a4157 100644 --- a/source/blender/editors/mesh/editmesh_path.c +++ b/source/blender/editors/mesh/editmesh_path.c @@ -669,18 +669,17 @@ static int edbm_shortest_path_pick_invoke(bContext *C, wmOperator *op, const wmE return edbm_shortest_path_pick_exec(C, op); } - Base *basact = NULL; BMVert *eve = NULL; BMEdge *eed = NULL; BMFace *efa = NULL; ViewContext vc; - BMEditMesh *em; bool track_active = true; em_setup_viewcontext(C, &vc); copy_v2_v2_int(vc.mval, event->mval); - em = vc.em; + Base *basact = BASACT(vc.view_layer); + BMEditMesh *em = vc.em; view3d_operator_needs_opengl(C); -- cgit v1.2.3