Fix T54686: objects don't occlude each other for edit-mesh select

1 files changed, 8 insertions, 9 deletions

diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
index 6f35c0aa748..9cbf179ab49 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
@@ -304,15 +304,14 @@ static int gizmo_preselect_edgering_test_select(bContext *C, wmGizmo *gz, const
   em_setup_viewcontext(C, &vc);
   copy_v2_v2_int(vc.mval, mval);
 
-  for (uint base_index = 0; base_index < gz_ring->bases_len; base_index++) {
-    Object *ob_iter = gz_ring->bases[base_index]->object;
-    ED_view3d_viewcontext_init_object(&vc, ob_iter);
-    BMEdge *eed_test = EDBM_edge_find_nearest_ex(&vc, &best.dist, NULL, false, false, NULL);
-    if (eed_test) {
-      best.ob = ob_iter;
-      best.eed = eed_test;
-      best.base_index = base_index;
-    }
+  uint base_index;
+  BMEdge *eed_test = EDBM_edge_find_nearest_ex(
+      &vc, &best.dist, NULL, false, false, NULL, gz_ring->bases, gz_ring->bases_len, &base_index);
+
+  if (eed_test) {
+    best.ob = gz_ring->bases[base_index]->object;
+    best.eed = eed_test;
+    best.base_index = base_index;
   }
 
   BMesh *bm = NULL;