[Bf-blender-cvs] [e7af2503c5f] master: Cleanup: Fix unused variable warning in merge by distance

Hans Goudey noreply at git.blender.org
Thu Jan 19 18:53:40 CET 2023


Commit: e7af2503c5f325fdf24ade8a53f31d8409f6e580
Author: Hans Goudey
Date:   Thu Jan 19 11:53:32 2023 -0600
Branches: master
https://developer.blender.org/rBe7af2503c5f325fdf24ade8a53f31d8409f6e580

Cleanup: Fix unused variable warning in merge by distance

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

M	source/blender/geometry/intern/mesh_merge_by_distance.cc

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

diff --git a/source/blender/geometry/intern/mesh_merge_by_distance.cc b/source/blender/geometry/intern/mesh_merge_by_distance.cc
index 0d1cdf93133..5374a6c08cd 100644
--- a/source/blender/geometry/intern/mesh_merge_by_distance.cc
+++ b/source/blender/geometry/intern/mesh_merge_by_distance.cc
@@ -1006,13 +1006,14 @@ static void weld_poly_split_recursive(Span<int> vert_dest_map,
  *                  done to reduce allocations.
  * \return r_weld_mesh: Loop and poly members will be configured here.
  */
-static void weld_poly_loop_ctx_setup_collapsed_and_split(Span<MLoop> mloop,
+static void weld_poly_loop_ctx_setup_collapsed_and_split(
 #ifdef USE_WELD_DEBUG
-                                                         Span<MPoly> mpoly,
+    Span<MLoop> mloop,
+    Span<MPoly> mpoly,
 #endif
-                                                         Span<int> vert_dest_map,
-                                                         const int remain_edge_ctx_len,
-                                                         WeldMesh *r_weld_mesh)
+    Span<int> vert_dest_map,
+    const int remain_edge_ctx_len,
+    WeldMesh *r_weld_mesh)
 {
   if (remain_edge_ctx_len == 0) {
     r_weld_mesh->poly_kill_len = r_weld_mesh->wpoly.size();
@@ -1262,13 +1263,14 @@ static void weld_mesh_context_create(const Mesh &mesh,
 
   weld_poly_loop_ctx_alloc(polys, loops, vert_dest_map, edge_dest_map, r_weld_mesh);
 
-  weld_poly_loop_ctx_setup_collapsed_and_split(loops,
+  weld_poly_loop_ctx_setup_collapsed_and_split(
 #ifdef USE_WELD_DEBUG
-                                               polys,
+      loops,
+      polys,
 #endif
-                                               vert_dest_map,
-                                               wedge.size() - r_weld_mesh->edge_kill_len,
-                                               r_weld_mesh);
+      vert_dest_map,
+      wedge.size() - r_weld_mesh->edge_kill_len,
+      r_weld_mesh);
 
   weld_poly_find_doubles(loops,
 #ifdef USE_WELD_DEBUG



More information about the Bf-blender-cvs mailing list