[Bf-blender-cvs] [db317f070e7] retopo_transform: clean up before split

[jon denning]

Commit: db317f070e7e542111fc42c0d0cf555e06d084fc
Author: jon denning
Date:   Thu Jul 7 15:09:23 2022 -0400
Branches: retopo_transform
https://developer.blender.org/rBdb317f070e7e542111fc42c0d0cf555e06d084fc

clean up before split

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/editors/transform/transform_snap_object.cc

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 5f790b31afb..71d801c6c7f 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -6828,7 +6828,6 @@ class VIEW3D_PT_snapping(Panel):
         col.label(text="Snap To")
         col.prop(tool_settings, "snap_elements", expand=True)
 
-        # col.separator()
         if 'INCREMENT' in snap_elements:
             col.prop(tool_settings, "use_snap_grid_absolute")
 
diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc
index db02031513b..f195a13fb6c 100644
--- a/source/blender/editors/transform/transform_snap_object.cc
+++ b/source/blender/editors/transform/transform_snap_object.cc
@@ -3426,31 +3426,6 @@ static eSnapMode transform_snap_context_project_view3d_mixed_impl(SnapObjectCont
   const bool use_retopo_mode = params->snap_target_select & SCE_SNAP_TARGET_RETOPOLOGY_MODE;
   const bool use_occlusion_test = params->use_occlusion_test && !XRAY_ENABLED(v3d);
 
-  /* Note: if both face raycast and face nearest are enabled, first find result of nearest, then
-   * override with raycast. */
-  if ((snap_to_flag & SCE_SNAP_MODE_FACE_NEAREST) && !has_hit) {
-    has_hit = nearestWorldObjects(
-        sctx, params, init_co, prev_co, loc, no, &index, &ob_eval, obmat);
-
-    if (has_hit) {
-      retval = SCE_SNAP_MODE_FACE_NEAREST;
-
-      copy_v3_v3(r_loc, loc);
-      if (r_no) {
-        copy_v3_v3(r_no, no);
-      }
-      if (r_ob) {
-        *r_ob = ob_eval;
-      }
-      if (r_obmat) {
-        copy_m4_m4(r_obmat, obmat);
-      }
-      if (r_index) {
-        *r_index = index;
-      }
-    }
-  }
-
   if (snap_to_flag & SCE_SNAP_MODE_FACE_RAYCAST || use_occlusion_test) {
     float ray_start[3], ray_normal[3];
     if (!ED_view3d_win_to_ray_clipped_ex(