amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix hollowing crash when splitting broken object has zero parts.

Browse source
This commit is contained in:
tamasmeszaros 2020-09-16 11:08:58 +02:00
parent 4d5d1390f0
commit af785d1486
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/libslic3r/OpenVDBUtils.cpp
View file

@ -64,11 +64,6 @@ openvdb::FloatGrid::Ptr mesh_to_grid(const TriangleMesh &mesh,
float interiorBandWidth, float interiorBandWidth,
int flags) int flags)
{ {
// openvdb::initialize();
// return openvdb::tools::meshToVolume<openvdb::FloatGrid>(
// TriangleMeshDataAdapter{mesh}, tr, exteriorBandWidth,
// interiorBandWidth, flags);
openvdb::initialize(); openvdb::initialize();
TriangleMeshPtrs meshparts = mesh.split(); TriangleMeshPtrs meshparts = mesh.split();
@ -83,15 +78,23 @@ openvdb::FloatGrid::Ptr mesh_to_grid(const TriangleMesh &mesh,
openvdb::FloatGrid::Ptr grid; openvdb::FloatGrid::Ptr grid;
for (TriangleMesh *m : meshparts) { for (TriangleMesh *m : meshparts) {
auto gridptr = openvdb::tools::meshToVolume<openvdb::FloatGrid>( auto subgrid = openvdb::tools::meshToVolume<openvdb::FloatGrid>(
TriangleMeshDataAdapter{*m}, tr, exteriorBandWidth, TriangleMeshDataAdapter{*m}, tr, exteriorBandWidth,
interiorBandWidth, flags); interiorBandWidth, flags);
if (grid && gridptr) openvdb::tools::csgUnion(*grid, *gridptr); if (grid && subgrid) openvdb::tools::csgUnion(*grid, *subgrid);
else if (gridptr) grid = std::move(gridptr); else if (subgrid) grid = std::move(subgrid);
} }
grid = openvdb::tools::levelSetRebuild(*grid, 0., exteriorBandWidth, interiorBandWidth); if (grid) {
grid = openvdb::tools::levelSetRebuild(*grid, 0., exteriorBandWidth,
interiorBandWidth);
} else if(meshparts.empty()) {
// Splitting failed, fall back to hollow the original mesh
grid = openvdb::tools::meshToVolume<openvdb::FloatGrid>(
TriangleMeshDataAdapter{mesh}, tr, exteriorBandWidth,
interiorBandWidth, flags);
}
return grid; return grid;
} }