From f266141d353c0204db6aa79bd487fba47c21c4c2 Mon Sep 17 00:00:00 2001 From: supermerill Date: Sat, 30 May 2020 16:28:43 +0200 Subject: [PATCH] fix gcc compile, from 9b60be0c1aeda35d81cb30fbef05e11c7e7351e3 --- src/libslic3r/Milling/MillingPostProcess.cpp | 7 +++++-- src/libslic3r/Milling/MillingPostProcess.hpp | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libslic3r/Milling/MillingPostProcess.cpp b/src/libslic3r/Milling/MillingPostProcess.cpp index 0b45bb239..059a24340 100644 --- a/src/libslic3r/Milling/MillingPostProcess.cpp +++ b/src/libslic3r/Milling/MillingPostProcess.cpp @@ -1,5 +1,6 @@ #include "MillingPostProcess.hpp" #include "../Layer.hpp" +#include "../ClipperUtils.hpp" namespace Slic3r { @@ -121,9 +122,11 @@ namespace Slic3r { ExtrusionEntityCollection all_milling; for (ExPolygon &ex_poly : milling_lines) { - getExtrusionLoop(layer, ex_poly.contour, intersection_pl(offset(ex_poly.contour, milling_diameter / 4), entrypoints_poly), all_milling); + Polylines good_entry_point = intersection_pl(offset(ex_poly.contour, milling_diameter / 4), entrypoints_poly); + getExtrusionLoop(layer, ex_poly.contour, good_entry_point, all_milling); for (Polygon& hole : ex_poly.holes) { - getExtrusionLoop(layer, hole, intersection_pl(offset(hole, milling_diameter / 3), entrypoints_poly), all_milling); + good_entry_point = intersection_pl(offset(hole, milling_diameter / 3), entrypoints_poly); + getExtrusionLoop(layer, hole, good_entry_point, all_milling); } } diff --git a/src/libslic3r/Milling/MillingPostProcess.hpp b/src/libslic3r/Milling/MillingPostProcess.hpp index 5fd168775..2fa2f3f35 100644 --- a/src/libslic3r/Milling/MillingPostProcess.hpp +++ b/src/libslic3r/Milling/MillingPostProcess.hpp @@ -2,7 +2,6 @@ #define slic3r_MillingPostProcess_hpp_ #include "../libslic3r.h" -#include #include "../ExPolygonCollection.hpp" #include "../Polygon.hpp" #include "../Layer.hpp"