From a5190dce9d08a4fdaddf82d592e50083e0713e19 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Sat, 4 Jun 2022 16:30:30 +0200 Subject: Mesh: Only check dirty normals flag of current domain The code that checked whether vertex normals needed to be recalculated was checking the dirty tag for face normals and vertex normals, in an attempt at increased safety. However, those tags are always set together anyway. Only checking the vertex dirty tag allows potentially allocating or updating the normals on the two domains independently, which could allow further skipping of calculations in some cases. --- source/blender/blenkernel/intern/mesh_normals.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/mesh_normals.cc b/source/blender/blenkernel/intern/mesh_normals.cc index ba1004e8371..2366b7526a1 100644 --- a/source/blender/blenkernel/intern/mesh_normals.cc +++ b/source/blender/blenkernel/intern/mesh_normals.cc @@ -345,7 +345,7 @@ void BKE_mesh_calc_normals_poly_and_vertex(const MVert *mvert, const float (*BKE_mesh_vertex_normals_ensure(const Mesh *mesh))[3] { - if (!(BKE_mesh_vertex_normals_are_dirty(mesh) || BKE_mesh_poly_normals_are_dirty(mesh))) { + if (!BKE_mesh_vertex_normals_are_dirty(mesh)) { BLI_assert(mesh->runtime.vert_normals != nullptr || mesh->totvert == 0); return mesh->runtime.vert_normals; } @@ -356,7 +356,7 @@ const float (*BKE_mesh_vertex_normals_ensure(const Mesh *mesh))[3] ThreadMutex *normals_mutex = (ThreadMutex *)mesh->runtime.normals_mutex; BLI_mutex_lock(normals_mutex); - if (!(BKE_mesh_vertex_normals_are_dirty(mesh) || BKE_mesh_poly_normals_are_dirty(mesh))) { + if (!BKE_mesh_vertex_normals_are_dirty(mesh)) { BLI_assert(mesh->runtime.vert_normals != nullptr); BLI_mutex_unlock(normals_mutex); return mesh->runtime.vert_normals; -- cgit v1.2.3