Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +4 -11
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bad85fe8c7 - Show all commits

15
source/blender/modifiers/intern/MOD_normal_edit.cc
View File

@ -213,7 +213,6 @@ static void normalEditModifier_do_radial(NormalEditModifierData *enmd,
Mesh *mesh, Mesh *mesh,
short (*clnors)[2], short (*clnors)[2],
blender::MutableSpan<blender::float3> loop_normals, blender::MutableSpan<blender::float3> loop_normals,
blender::Span<blender::float3> poly_normals,
const short mix_mode, const short mix_mode,
const float mix_factor, const float mix_factor,
const float mix_limit, const float mix_limit,
@ -324,7 +323,7 @@ static void normalEditModifier_do_radial(NormalEditModifierData *enmd,
polys, polys,
loops, loops,
mesh->vert_normals(), mesh->vert_normals(),
poly_normals, mesh->poly_normals(),
sharp_faces, sharp_faces,
sharp_edges, sharp_edges,
nos, nos,
@ -340,7 +339,6 @@ static void normalEditModifier_do_directional(NormalEditModifierData *enmd,
Mesh *mesh, Mesh *mesh,
short (*clnors)[2], short (*clnors)[2],
blender::MutableSpan<blender::float3> loop_normals, blender::MutableSpan<blender::float3> loop_normals,
const blender::Span<blender::float3> poly_normals,
const short mix_mode, const short mix_mode,
const float mix_factor, const float mix_factor,
const float mix_limit, const float mix_limit,
@ -430,7 +428,7 @@ static void normalEditModifier_do_directional(NormalEditModifierData *enmd,
polys, polys,
loops, loops,
mesh->vert_normals(), mesh->vert_normals(),
poly_normals, mesh->poly_normals(),
sharp_faces, sharp_faces,
sharp_edges, sharp_edges,
nos, nos,
@ -512,9 +510,6 @@ static Mesh *normalEditModifier_do(NormalEditModifierData *enmd,
CustomData *ldata = &result->ldata; CustomData *ldata = &result->ldata;
const blender::Span<blender::float3> vert_normals = result->vert_normals();
const blender::Span<blender::float3> poly_normals = result->poly_normals();
bke::MutableAttributeAccessor attributes = result->attributes_for_write(); bke::MutableAttributeAccessor attributes = result->attributes_for_write();
bke::SpanAttributeWriter<bool> sharp_edges = attributes.lookup_or_add_for_write_span<bool>( bke::SpanAttributeWriter<bool> sharp_edges = attributes.lookup_or_add_for_write_span<bool>(
"sharp_edge", ATTR_DOMAIN_EDGE); "sharp_edge", ATTR_DOMAIN_EDGE);
@ -532,8 +527,8 @@ static Mesh *normalEditModifier_do(NormalEditModifierData *enmd,
polys, polys,
loops, loops,
{}, {},
vert_normals, result->vert_normals(),
poly_normals, result->poly_normals(),
sharp_edges.span.data(), sharp_edges.span.data(),
sharp_faces, sharp_faces,
true, true,
@ -557,7 +552,6 @@ static Mesh *normalEditModifier_do(NormalEditModifierData *enmd,
result, result,
clnors, clnors,
loop_normals, loop_normals,
poly_normals,
enmd->mix_mode, enmd->mix_mode,
enmd->mix_factor, enmd->mix_factor,
enmd->mix_limit, enmd->mix_limit,
@ -577,7 +571,6 @@ static Mesh *normalEditModifier_do(NormalEditModifierData *enmd,
result, result,
clnors, clnors,
loop_normals, loop_normals,
poly_normals,
enmd->mix_mode, enmd->mix_mode,
enmd->mix_factor, enmd->mix_factor,
enmd->mix_limit, enmd->mix_limit,