Cleanup: Rearrange arguments
This commit is contained in:
parent
3a9ea48b7d
commit
b9e67ee1d6
|
@ -609,11 +609,11 @@ void BKE_mesh_normals_loop_split(const float (*vert_positions)[3],
|
|||
int numLoops,
|
||||
const struct MPoly *mpolys,
|
||||
const float (*poly_normals)[3],
|
||||
const bool *sharp_faces,
|
||||
int numPolys,
|
||||
bool use_split_normals,
|
||||
float split_angle,
|
||||
const bool *sharp_edges,
|
||||
const bool *sharp_faces,
|
||||
const int *loop_to_poly_map,
|
||||
MLoopNorSpaceArray *r_lnors_spacearr,
|
||||
short (*clnors_data)[2]);
|
||||
|
|
|
@ -290,6 +290,8 @@ static void data_transfer_dtdata_type_preprocess(Mesh *me_src,
|
|||
if (dirty_nors_dst || do_loop_nors_dst) {
|
||||
const bool *sharp_edges = static_cast<const bool *>(
|
||||
CustomData_get_layer_named(&me_dst->edata, CD_PROP_BOOL, "sharp_edge"));
|
||||
const bool *sharp_faces = static_cast<const bool *>(
|
||||
CustomData_get_layer_named(&me_dst->pdata, CD_PROP_BOOL, "sharp_face"));
|
||||
BKE_mesh_normals_loop_split(positions_dst,
|
||||
BKE_mesh_vertex_normals_ensure(me_dst),
|
||||
num_verts_dst,
|
||||
|
@ -300,12 +302,11 @@ static void data_transfer_dtdata_type_preprocess(Mesh *me_src,
|
|||
num_loops_dst,
|
||||
polys_dst,
|
||||
BKE_mesh_poly_normals_ensure(me_dst),
|
||||
static_cast<const bool *>(CustomData_get_layer_named(
|
||||
&me_dst->pdata, CD_PROP_BOOL, "sharp_face")),
|
||||
num_polys_dst,
|
||||
use_split_nors_dst,
|
||||
split_angle_dst,
|
||||
sharp_edges,
|
||||
sharp_faces,
|
||||
nullptr,
|
||||
nullptr,
|
||||
custom_nors_dst);
|
||||
|
|
|
@ -2276,6 +2276,8 @@ void BKE_keyblock_mesh_calc_normals(const KeyBlock *kb,
|
|||
CustomData_get_layer(&mesh->ldata, CD_CUSTOMLOOPNORMAL)); /* May be nullptr. */
|
||||
const bool *sharp_edges = static_cast<const bool *>(
|
||||
CustomData_get_layer_named(&mesh->edata, CD_PROP_BOOL, "sharp_edge"));
|
||||
const bool *sharp_faces = static_cast<const bool *>(
|
||||
CustomData_get_layer_named(&mesh->pdata, CD_PROP_BOOL, "sharp_face"));
|
||||
BKE_mesh_normals_loop_split(positions,
|
||||
vert_normals,
|
||||
mesh->totvert,
|
||||
|
@ -2286,12 +2288,11 @@ void BKE_keyblock_mesh_calc_normals(const KeyBlock *kb,
|
|||
mesh->totloop,
|
||||
polys,
|
||||
poly_normals,
|
||||
static_cast<const bool *>(CustomData_get_layer_named(
|
||||
&mesh->pdata, CD_PROP_BOOL, "sharp_face")),
|
||||
mesh->totpoly,
|
||||
(mesh->flag & ME_AUTOSMOOTH) != 0,
|
||||
mesh->smoothresh,
|
||||
sharp_edges,
|
||||
sharp_faces,
|
||||
nullptr,
|
||||
nullptr,
|
||||
clnors);
|
||||
|
|
|
@ -1844,7 +1844,8 @@ void BKE_mesh_calc_normals_split_ex(Mesh *mesh,
|
|||
short(*clnors)[2] = (short(*)[2])CustomData_get_layer(&mesh->ldata, CD_CUSTOMLOOPNORMAL);
|
||||
const bool *sharp_edges = static_cast<const bool *>(
|
||||
CustomData_get_layer_named(&mesh->edata, CD_PROP_BOOL, "sharp_edge"));
|
||||
|
||||
const bool *sharp_faces = static_cast<const bool *>(
|
||||
CustomData_get_layer_named(&mesh->pdata, CD_PROP_BOOL, "sharp_face"));
|
||||
const Span<float3> positions = mesh->vert_positions();
|
||||
const Span<MEdge> edges = mesh->edges();
|
||||
const Span<MPoly> polys = mesh->polys();
|
||||
|
@ -1860,12 +1861,11 @@ void BKE_mesh_calc_normals_split_ex(Mesh *mesh,
|
|||
loops.size(),
|
||||
polys.data(),
|
||||
BKE_mesh_poly_normals_ensure(mesh),
|
||||
static_cast<const bool *>(CustomData_get_layer_named(
|
||||
&mesh->pdata, CD_PROP_BOOL, "sharp_face")),
|
||||
polys.size(),
|
||||
use_split_normals,
|
||||
split_angle,
|
||||
sharp_edges,
|
||||
sharp_faces,
|
||||
nullptr,
|
||||
r_lnors_spacearr,
|
||||
clnors);
|
||||
|
|
|
@ -410,6 +410,8 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(MirrorModifierData *mmd,
|
|||
|
||||
const bool *sharp_edges = static_cast<const bool *>(
|
||||
CustomData_get_layer_named(&mesh->edata, CD_PROP_BOOL, "sharp_edge"));
|
||||
const bool *sharp_faces = static_cast<const bool *>(
|
||||
CustomData_get_layer_named(&result->pdata, CD_PROP_BOOL, "sharp_face"));
|
||||
BKE_mesh_normals_loop_split(BKE_mesh_vert_positions(result),
|
||||
BKE_mesh_vertex_normals_ensure(result),
|
||||
result->totvert,
|
||||
|
@ -420,12 +422,11 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(MirrorModifierData *mmd,
|
|||
totloop,
|
||||
BKE_mesh_polys(result),
|
||||
BKE_mesh_poly_normals_ensure(result),
|
||||
static_cast<const bool *>(CustomData_get_layer_named(
|
||||
&result->pdata, CD_PROP_BOOL, "sharp_face")),
|
||||
totpoly,
|
||||
true,
|
||||
mesh->smoothresh,
|
||||
sharp_edges,
|
||||
sharp_faces,
|
||||
nullptr,
|
||||
&lnors_spacearr,
|
||||
clnors);
|
||||
|
|
|
@ -1451,11 +1451,11 @@ void BKE_mesh_normals_loop_split(const float (*vert_positions)[3],
|
|||
const int numLoops,
|
||||
const MPoly *mpolys,
|
||||
const float (*poly_normals)[3],
|
||||
const bool *sharp_faces,
|
||||
const int numPolys,
|
||||
const bool use_split_normals,
|
||||
const float split_angle,
|
||||
const bool *sharp_edges,
|
||||
const bool *sharp_faces,
|
||||
const int *loop_to_poly_map,
|
||||
MLoopNorSpaceArray *r_lnors_spacearr,
|
||||
short (*clnors_data)[2])
|
||||
|
@ -1659,11 +1659,11 @@ static void mesh_normals_loop_custom_set(const float (*positions)[3],
|
|||
numLoops,
|
||||
mpolys,
|
||||
poly_normals,
|
||||
sharp_faces,
|
||||
numPolys,
|
||||
use_split_normals,
|
||||
split_angle,
|
||||
sharp_edges.data(),
|
||||
sharp_faces,
|
||||
loop_to_poly.data(),
|
||||
&lnors_spacearr,
|
||||
nullptr);
|
||||
|
@ -1788,11 +1788,11 @@ static void mesh_normals_loop_custom_set(const float (*positions)[3],
|
|||
numLoops,
|
||||
mpolys,
|
||||
poly_normals,
|
||||
sharp_faces,
|
||||
numPolys,
|
||||
use_split_normals,
|
||||
split_angle,
|
||||
sharp_edges.data(),
|
||||
sharp_faces,
|
||||
loop_to_poly.data(),
|
||||
&lnors_spacearr,
|
||||
nullptr);
|
||||
|
|
|
@ -1370,6 +1370,8 @@ void BKE_mesh_remap_calc_loops_from_mesh(const int mode,
|
|||
if (dirty_nors_dst || do_loop_nors_dst) {
|
||||
const bool *sharp_edges = static_cast<const bool *>(
|
||||
CustomData_get_layer_named(&mesh_dst->edata, CD_PROP_BOOL, "sharp_edge"));
|
||||
const bool *sharp_faces = static_cast<const bool *>(
|
||||
CustomData_get_layer_named(&mesh_dst->pdata, CD_PROP_BOOL, "sharp_face"));
|
||||
BKE_mesh_normals_loop_split(vert_positions_dst,
|
||||
BKE_mesh_vertex_normals_ensure(mesh_dst),
|
||||
numverts_dst,
|
||||
|
@ -1380,12 +1382,11 @@ void BKE_mesh_remap_calc_loops_from_mesh(const int mode,
|
|||
numloops_dst,
|
||||
polys_dst,
|
||||
poly_nors_dst,
|
||||
static_cast<const bool *>(CustomData_get_layer_named(
|
||||
&mesh_dst->pdata, CD_PROP_BOOL, "sharp_face")),
|
||||
numpolys_dst,
|
||||
use_split_nors_dst,
|
||||
split_angle_dst,
|
||||
sharp_edges,
|
||||
sharp_faces,
|
||||
nullptr,
|
||||
nullptr,
|
||||
custom_nors_dst);
|
||||
|
|
|
@ -380,11 +380,11 @@ void mesh_render_data_update_normals(MeshRenderData *mr, const eMRDataType data_
|
|||
mr->loop_len,
|
||||
mr->mpoly,
|
||||
mr->poly_normals,
|
||||
mr->sharp_faces,
|
||||
mr->poly_len,
|
||||
is_auto_smooth,
|
||||
split_angle,
|
||||
sharp_edges,
|
||||
mr->sharp_faces,
|
||||
nullptr,
|
||||
nullptr,
|
||||
clnors);
|
||||
|
|
|
@ -563,7 +563,8 @@ static Mesh *normalEditModifier_do(NormalEditModifierData *enmd,
|
|||
CustomData_duplicate_referenced_layer(ldata, CD_CUSTOMLOOPNORMAL, loops_num));
|
||||
loop_normals = static_cast<float(*)[3]>(
|
||||
MEM_malloc_arrayN(size_t(loops_num), sizeof(*loop_normals), __func__));
|
||||
|
||||
const bool *sharp_faces = static_cast<const bool *>(
|
||||
CustomData_get_layer_named(&result->pdata, CD_PROP_BOOL, "sharp_face"));
|
||||
BKE_mesh_normals_loop_split(positions,
|
||||
vert_normals,
|
||||
verts_num,
|
||||
|
@ -574,12 +575,11 @@ static Mesh *normalEditModifier_do(NormalEditModifierData *enmd,
|
|||
loops_num,
|
||||
polys,
|
||||
poly_normals,
|
||||
static_cast<const bool *>(CustomData_get_layer_named(
|
||||
&result->pdata, CD_PROP_BOOL, "sharp_face")),
|
||||
polys_num,
|
||||
true,
|
||||
result->smoothresh,
|
||||
sharp_edges.span.data(),
|
||||
sharp_faces,
|
||||
nullptr,
|
||||
nullptr,
|
||||
clnors);
|
||||
|
|
|
@ -236,11 +236,11 @@ static void apply_weights_vertex_normal(WeightedNormalModifierData *wnmd,
|
|||
loops_num,
|
||||
mpoly,
|
||||
poly_normals,
|
||||
wn_data->sharp_faces,
|
||||
polys_num,
|
||||
true,
|
||||
split_angle,
|
||||
wn_data->sharp_edges,
|
||||
wn_data->sharp_faces,
|
||||
loop_to_poly.data(),
|
||||
&lnors_spacearr,
|
||||
has_clnors ? clnors : nullptr);
|
||||
|
@ -424,11 +424,11 @@ static void apply_weights_vertex_normal(WeightedNormalModifierData *wnmd,
|
|||
loops_num,
|
||||
mpoly,
|
||||
poly_normals,
|
||||
wn_data->sharp_faces,
|
||||
polys_num,
|
||||
true,
|
||||
split_angle,
|
||||
wn_data->sharp_edges,
|
||||
wn_data->sharp_faces,
|
||||
loop_to_poly.data(),
|
||||
nullptr,
|
||||
has_clnors ? clnors : nullptr);
|
||||
|
|
Loading…
Reference in New Issue