3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-27 10:41:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'tm_openvdb_integration' into lm_tm_hollowing

Browse source 
SLAPrintSteps parallel functions now fully adapted to sla::ccr
This commit is contained in:
tamasmeszaros 2019-11-12 16:56:06 +01:00
commit 97811130a1
13 changed files with 1215 additions and 1077 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/Plater.cpp
View file

@ -2882,11 +2882,12 @@ void Plater::priv::HollowJob::process()
if (st < 100) update_status(int(st), s);
};
TriangleMesh omesh = sla::generate_interior(*m_object_mesh, m_cfg, ctl);
std::unique_ptr<TriangleMesh> omesh =
sla::generate_interior(*m_object_mesh, m_cfg, ctl);
if (!omesh.empty()) {
if (omesh && !omesh->empty()) {
m_output_mesh.reset(new TriangleMesh{*m_object_mesh});
m_output_mesh->merge(omesh);
m_output_mesh->merge(*omesh);
m_output_mesh->require_shared_vertices();
update_status(90, _(L("Indexing hollowed object")));