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

Fix: Build error in lite build after boolean change

Browse Source
This commit is contained in:
Hans Goudey
2024-03-14 18:50:19 -04:00
parent 57729aa8bb
commit 15c060548a
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -805,8 +805,6 @@ static Mesh *imesh_to_mesh(meshintersect::IMesh *im, MeshesToIMeshInfo &mim)
return result;
}
#endif // WITH_GMP
static meshintersect::BoolOpType operation_to_mesh_arr_mode(const Operation operation)
{
switch (operation) {
@@ -830,7 +828,6 @@ static Mesh *mesh_boolean_mesh_arr(Span<const Mesh *> meshes,
const meshintersect::BoolOpType boolean_mode,
Vector<int> *r_intersecting_edges)
{
#ifdef WITH_GMP
BLI_assert(transforms.is_empty() || meshes.size() == transforms.size());
BLI_assert(material_remaps.is_empty() || material_remaps.size() == meshes.size());
if (meshes.size() <= 0) {
@@ -879,19 +876,10 @@ static Mesh *mesh_boolean_mesh_arr(Span<const Mesh *> meshes,
}
return result;
#else // WITH_GMP
UNUSED_VARS(meshes,
transforms,
material_remaps,
target_transform,
use_self,
hole_tolerant,
boolean_mode,
r_intersecting_edges);
return BKE_mesh_new_nomain(0, 0, 0, 0);
#endif // WITH_GMP
}
#endif // WITH_GMP
/** \} */
/* -------------------------------------------------------------------- */
@@ -1184,6 +1172,7 @@ Mesh *mesh_boolean(Span<const Mesh *> meshes,
operation_to_float_mode(op_params.boolean_mode),
r_intersecting_edges);
case Solver::MeshArr:
#ifdef WITH_GMP
return mesh_boolean_mesh_arr(meshes,
transforms,
target_transform,
@@ -1192,6 +1181,9 @@ Mesh *mesh_boolean(Span<const Mesh *> meshes,
!op_params.watertight,
operation_to_mesh_arr_mode(op_params.boolean_mode),
r_intersecting_edges);
#else
return nullptr;
#endif
default:
BLI_assert_unreachable();
}