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

src/libslic3r/SLA/SLABasePool.hpp

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

src/libslic3r/SLAPrint.cpp

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