[Bf-blender-cvs] [7c519aa5d87] master: Cleanup: Make loop normal calculation function static
Hans Goudey
noreply at git.blender.org
Sat Nov 12 06:27:56 CET 2022
Commit: 7c519aa5d8731b168b0750349bab98946564d6d8
Author: Hans Goudey
Date: Fri Nov 11 21:58:38 2022 -0600
Branches: master
https://developer.blender.org/rB7c519aa5d8731b168b0750349bab98946564d6d8
Cleanup: Make loop normal calculation function static
===================================================================
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/intern/mesh_normals.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 8f6786d4113..bb0b4467bd2 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -494,15 +494,6 @@ void BKE_mesh_calc_normals_looptri(const struct MVert *mverts,
const struct MLoopTri *looptri,
int looptri_num,
float (*r_tri_nors)[3]);
-void BKE_mesh_loop_manifold_fan_around_vert_next(const struct MLoop *mloops,
- const struct MPoly *mpolys,
- const int *loop_to_poly,
- const int *e2lfan_curr,
- uint mv_pivot_index,
- const struct MLoop **r_mlfan_curr,
- int *r_mlfan_curr_index,
- int *r_mlfan_vert_index,
- int *r_mpfan_curr_index);
/**
* Define sharp edges as needed to mimic 'autosmooth' from angle threshold.
diff --git a/source/blender/blenkernel/intern/mesh_normals.cc b/source/blender/blenkernel/intern/mesh_normals.cc
index 347532028f5..23e3e1e604b 100644
--- a/source/blender/blenkernel/intern/mesh_normals.cc
+++ b/source/blender/blenkernel/intern/mesh_normals.cc
@@ -966,15 +966,15 @@ void BKE_edges_sharp_from_angle_set(const MVert *mverts,
MEM_freeN(loop_to_poly);
}
-void BKE_mesh_loop_manifold_fan_around_vert_next(const MLoop *mloops,
- const MPoly *mpolys,
- const int *loop_to_poly,
- const int *e2lfan_curr,
- const uint mv_pivot_index,
- const MLoop **r_mlfan_curr,
- int *r_mlfan_curr_index,
- int *r_mlfan_vert_index,
- int *r_mpfan_curr_index)
+void loop_manifold_fan_around_vert_next(const MLoop *mloops,
+ const MPoly *mpolys,
+ const int *loop_to_poly,
+ const int *e2lfan_curr,
+ const uint mv_pivot_index,
+ const MLoop **r_mlfan_curr,
+ int *r_mlfan_curr_index,
+ int *r_mlfan_vert_index,
+ int *r_mpfan_curr_index)
{
/* WARNING: This is rather complex!
* We have to find our next edge around the vertex (fan mode).
@@ -1214,15 +1214,15 @@ static void split_loop_nor_fan_do(LoopSplitTaskDataCommon *common_data, LoopSpli
copy_v3_v3(vec_prev, vec_curr);
/* Find next loop of the smooth fan. */
- BKE_mesh_loop_manifold_fan_around_vert_next(loops.data(),
- polys.data(),
- loop_to_poly.data(),
- e2lfan_curr,
- mv_pivot_index,
- &mlfan_curr,
- &mlfan_curr_index,
- &mlfan_vert_index,
- &mpfan_curr_index);
+ loop_manifold_fan_around_vert_next(loops.data(),
+ polys.data(),
+ loop_to_poly.data(),
+ e2lfan_curr,
+ mv_pivot_index,
+ &mlfan_curr,
+ &mlfan_curr_index,
+ &mlfan_vert_index,
+ &mpfan_curr_index);
e2lfan_curr = edge_to_loops[mlfan_curr->e];
}
@@ -1369,15 +1369,15 @@ static bool loop_split_generator_check_cyclic_smooth_fan(const Span<MLoop> mloop
while (true) {
/* Find next loop of the smooth fan. */
- BKE_mesh_loop_manifold_fan_around_vert_next(mloops.data(),
- mpolys.data(),
- loop_to_poly.data(),
- e2lfan_curr,
- mv_pivot_index,
- &mlfan_curr,
- &mlfan_curr_index,
- &mlfan_vert_index,
- &mpfan_curr_index);
+ loop_manifold_fan_around_vert_next(mloops.data(),
+ mpolys.data(),
+ loop_to_poly.data(),
+ e2lfan_curr,
+ mv_pivot_index,
+ &mlfan_curr,
+ &mlfan_curr_index,
+ &mlfan_vert_index,
+ &mpfan_curr_index);
e2lfan_curr = edge_to_loops[mlfan_curr->e];
More information about the Bf-blender-cvs
mailing list