diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake index bf23698cf4..c7facc2c62 100644 --- a/deps/wxWidgets/wxWidgets.cmake +++ b/deps/wxWidgets/wxWidgets.cmake @@ -1,11 +1,4 @@ -if (APPLE) - # The new OSX 11 (Big Sur) is not compatible with wxWidgets 3.1.3. - # Let's use patched wxWidgets 3.1.4, even though it is not quite tested. - set(_wx_git_tag v3.1.4-patched) -else () - # Use the tested patched wxWidgets 3.1.3 everywhere else. - set(_wx_git_tag v3.1.3-patched) -endif () +set(_wx_git_tag v3.1.4-patched) # set(_patch_command "") set(_wx_toolkit "") diff --git a/src/libslic3r/Geometry.cpp b/src/libslic3r/Geometry.cpp index 45730dd9f5..aac7c77524 100644 --- a/src/libslic3r/Geometry.cpp +++ b/src/libslic3r/Geometry.cpp @@ -245,8 +245,7 @@ Polygon convex_hull(Points points) return hull; } -Pointf3s -convex_hull(Pointf3s points) +Pointf3s convex_hull(Pointf3s points) { assert(points.size() >= 3); // sort input points @@ -304,8 +303,7 @@ convex_hull(Pointf3s points) return hull; } -Polygon -convex_hull(const Polygons &polygons) +Polygon convex_hull(const Polygons &polygons) { Points pp; for (Polygons::const_iterator p = polygons.begin(); p != polygons.end(); ++p) {