griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #144340: Potential deadlock in normals cache with no faces

Browse Source 
The code path isn't well defined when there aren't any faces, causing
the vert, face, and corner normal caches to call each other, potentially
trying to lock the same mutex twice.
This commit is contained in:
Hans Goudey
2025-08-11 09:37:16 -04:00
parent 6eea75e928
commit 62397597e8
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/mesh_normals.cc
View File

@@ -411,6 +411,9 @@ blender::Span<blender::float3> Mesh::face_normals() const
{
using namespace blender;
using namespace blender::bke;
if (this->faces_num == 0) {
return {};
}
this->runtime->face_normals_cache.ensure([&](NormalsCache &r_data) {
if (const GAttributeReader custom = this->attributes().lookup("custom_normal")) {
if (custom.varray.type().is<float3>()) {
@@ -463,6 +466,9 @@ blender::Span<blender::float3> Mesh::corner_normals() const
{
using namespace blender;
using namespace blender::bke;
if (this->faces_num == 0) {
return {};
}
this->runtime->corner_normals_cache.ensure([&](NormalsCache &r_data) {
const OffsetIndices<int> faces = this->faces();
switch (this->normals_domain()) {