diff options
author | bubnikv <bubnikv@gmail.com> | 2016-10-24 15:07:38 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2016-10-24 15:07:38 +0300 |
commit | 250ff451ba337a154b5de4ca5d16b425a55a5166 (patch) | |
tree | fccfff853ed46464a1e43edd14837ee047d92a4f /xs/src/libslic3r/ClipperUtils.hpp | |
parent | cc8b7390eedb6d1d2df87a55bb77fda279703f32 (diff) |
by alexrj: Fixes in GCodeSender to reset the connection after it breaks.
by alexrj: Fix in mouse handling of 2DBed.
by alexrj: ClipperUtils for ExPolygon vs. ExPolygon
Diffstat (limited to 'xs/src/libslic3r/ClipperUtils.hpp')
-rw-r--r-- | xs/src/libslic3r/ClipperUtils.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xs/src/libslic3r/ClipperUtils.hpp b/xs/src/libslic3r/ClipperUtils.hpp index 9f3fca9e9..00b7a56a7 100644 --- a/xs/src/libslic3r/ClipperUtils.hpp +++ b/xs/src/libslic3r/ClipperUtils.hpp @@ -141,6 +141,7 @@ Slic3r::ExPolygons union_ex(const Slic3r::Polygons &subject, bool safety_offset Slic3r::ExPolygons union_ex(const Slic3r::Surfaces &subject, bool safety_offset = false); void union_(const Slic3r::Polygons &subject1, const Slic3r::Polygons &subject2, Slic3r::Polygons* retval, bool safety_offset = false); +Slic3r::Polygons union_(const Slic3r::ExPolygons &subject1, const Slic3r::ExPolygons &subject2, bool safety_offset = false); void union_pt(const Slic3r::Polygons &subject, ClipperLib::PolyTree* retval, bool safety_offset_ = false); void union_pt_chained(const Slic3r::Polygons &subject, Slic3r::Polygons* retval, bool safety_offset_ = false); |