[Bf-blender-cvs] [8cde4b3d3b6] temp-vert-normals-cleanup: Cleanup: Add a few more asserts for proper normals
Hans Goudey
noreply at git.blender.org
Thu Jan 13 19:51:03 CET 2022
Commit: 8cde4b3d3b6f4969c44917647821151dba82f488
Author: Hans Goudey
Date: Thu Jan 13 12:30:32 2022 -0600
Branches: temp-vert-normals-cleanup
https://developer.blender.org/rB8cde4b3d3b6f4969c44917647821151dba82f488
Cleanup: Add a few more asserts for proper normals
===================================================================
M source/blender/blenkernel/intern/mesh.cc
M source/blender/blenkernel/intern/mesh_convert.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index a7e263bcc9c..1aa3477437a 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -1955,6 +1955,8 @@ void BKE_mesh_calc_normals_split_ex(Mesh *mesh, MLoopNorSpaceArray *r_lnors_spac
clnors,
nullptr);
+ BKE_mesh_assert_normals_dirty_or_calculated(mesh);
+
mesh->runtime.cd_dirty_loop &= ~CD_MASK_NORMAL;
}
@@ -2231,6 +2233,7 @@ void BKE_mesh_split_faces(Mesh *mesh, bool free_loop_normals)
/* Also frees new_verts/edges temp data, since we used its memarena to allocate them. */
BKE_lnor_spacearr_free(&lnors_spacearr);
+ BKE_mesh_assert_normals_dirty_or_calculated(mesh);
#ifdef VALIDATE_MESH
BKE_mesh_validate(mesh, true, true);
#endif
diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc
index feed64ff0da..cbc772d93a6 100644
--- a/source/blender/blenkernel/intern/mesh_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_convert.cc
@@ -1619,6 +1619,8 @@ void BKE_mesh_nomain_to_mesh(Mesh *mesh_src,
}
BKE_id_free(nullptr, mesh_src);
}
+
+ BKE_mesh_assert_normals_dirty_or_calculated(mesh_dst);
}
void BKE_mesh_nomain_to_meshkey(Mesh *mesh_src, Mesh *mesh_dst, KeyBlock *kb)
More information about the Bf-blender-cvs
mailing list