3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/Slic3r

Browse source
This commit is contained in:
Enrico Turri 2018-12-14 10:09:10 +01:00
commit 728a124759
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libslic3r/SLA/SLABasePool.hpp
View file

@ -7,11 +7,12 @@
namespace Slic3r { namespace Slic3r {
class ExPolygon; class ExPolygon;
using ExPolygons = std::vector<ExPolygon>;
class TriangleMesh; class TriangleMesh;
namespace sla { namespace sla {
using ExPolygons = std::vector<ExPolygon>;
using ThrowOnCancel = std::function<void(void)>; using ThrowOnCancel = std::function<void(void)>;
/// Calculate the polygon representing the silhouette from the specified height /// Calculate the polygon representing the silhouette from the specified height

2
src/libslic3r/SLAPrint.cpp
View file

@ -565,7 +565,7 @@ void SLAPrint::process()
if(!po.m_config.supports_enable.getBool()) elevation = 0; if(!po.m_config.supports_enable.getBool()) elevation = 0;
sla::PoolConfig pcfg(wt, h, md, er); sla::PoolConfig pcfg(wt, h, md, er);
sla::ExPolygons bp; ExPolygons bp;
double pad_h = sla::get_pad_elevation(pcfg); double pad_h = sla::get_pad_elevation(pcfg);
auto&& trmesh = po.transformed_mesh(); auto&& trmesh = po.transformed_mesh();