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

Fix #141612: Boolean crash with NAN mesh vertex coordinates

Browse Source 
Resolve crash caused from initializing `mpq3` values with NAN.

Ref !141655
This commit is contained in:
Campbell Barton
2025-07-09 17:13:18 +10:00
parent 88f812bf9a
commit 4a68512db9
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/geometry/intern/mesh_boolean.cc
View File

@@ -78,6 +78,21 @@ static float4x4 clean_transform(const float4x4 &mat)
return cleaned; return cleaned;
} }
static float3 clean_float3(const float3 &co)
{
float3 cleaned = co;
if (UNLIKELY(!isfinite(co[0]))) {
cleaned[0] = 0.0f;
}
if (UNLIKELY(!isfinite(co[1]))) {
cleaned[1] = 0.0f;
}
if (UNLIKELY(!isfinite(co[2]))) {
cleaned[2] = 0.0f;
}
return cleaned;
}
/* `MeshesToIMeshInfo` keeps track of information used when combining a number /* `MeshesToIMeshInfo` keeps track of information used when combining a number
* of `Mesh`es into a single `IMesh` for doing boolean on. * of `Mesh`es into a single `IMesh` for doing boolean on.
* Mostly this means keeping track of the index offsets for various mesh elements. */ * Mostly this means keeping track of the index offsets for various mesh elements. */
@@ -329,7 +344,7 @@ static meshintersect::IMesh meshes_to_imesh(Span<const Mesh *> meshes,
if (transforms.is_empty() || r_info->to_target_transform[mi] == float4x4::identity()) { if (transforms.is_empty() || r_info->to_target_transform[mi] == float4x4::identity()) {
threading::parallel_for(vert_positions.index_range(), 2048, [&](IndexRange range) { threading::parallel_for(vert_positions.index_range(), 2048, [&](IndexRange range) {
for (int i : range) { for (int i : range) {
float3 co = vert_positions[i]; float3 co = clean_float3(vert_positions[i]);
mpq3 mco = mpq3(co.x, co.y, co.z); mpq3 mco = mpq3(co.x, co.y, co.z);
double3 dco(mco[0].get_d(), mco[1].get_d(), mco[2].get_d()); double3 dco(mco[0].get_d(), mco[1].get_d(), mco[2].get_d());
verts[i] = new meshintersect::Vert(mco, dco, meshintersect::NO_INDEX, i); verts[i] = new meshintersect::Vert(mco, dco, meshintersect::NO_INDEX, i);
@@ -339,7 +354,8 @@ static meshintersect::IMesh meshes_to_imesh(Span<const Mesh *> meshes,
else { else {
threading::parallel_for(vert_positions.index_range(), 2048, [&](IndexRange range) { threading::parallel_for(vert_positions.index_range(), 2048, [&](IndexRange range) {
for (int i : range) { for (int i : range) {
float3 co = math::transform_point(r_info->to_target_transform[mi], vert_positions[i]); float3 co = math::transform_point(r_info->to_target_transform[mi],
clean_float3(vert_positions[i]));
mpq3 mco = mpq3(co.x, co.y, co.z); mpq3 mco = mpq3(co.x, co.y, co.z);
double3 dco(mco[0].get_d(), mco[1].get_d(), mco[2].get_d()); double3 dco(mco[0].get_d(), mco[1].get_d(), mco[2].get_d());
verts[i] = new meshintersect::Vert(mco, dco, meshintersect::NO_INDEX, i); verts[i] = new meshintersect::Vert(mco, dco, meshintersect::NO_INDEX, i);