Merge branch 'blender-v3.2-release'

This commit is contained in:
Hans Goudey 2022-05-12 11:15:26 +02:00
commit 9599c5415d
1 changed files with 4 additions and 4 deletions

View File

@ -1118,6 +1118,10 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
MEM_freeN(vert_loop_map);
}
if ((ltmd->flag & MOD_SCREW_NORMAL_CALC)) {
BKE_mesh_vertex_normals_clear_dirty(result);
}
if ((ltmd->flag & MOD_SCREW_MERGE) && (screw_ofs == 0.0f)) {
result = mesh_remove_doubles_on_axis(result,
mvert_new,
@ -1128,10 +1132,6 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
ltmd->merge_dist);
}
if ((ltmd->flag & MOD_SCREW_NORMAL_CALC)) {
BKE_mesh_vertex_normals_clear_dirty(result);
}
return result;
}