[Bf-blender-cvs] [36593405713] master: Cleanup: logical error in path select picking

[Campbell Barton]

Commit: 36593405713745854f4da933282ca3c3a5041063
Author: Campbell Barton
Date:   Mon Mar 29 16:45:37 2021 +1100
Branches: master
https://developer.blender.org/rB36593405713745854f4da933282ca3c3a5041063

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.

===================================================================

M	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);