GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-12 01:39:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bumping up wxWidgets to 3.1.4-patched on all platforms.

Browse Source
This commit is contained in:
Vojtech Bubnik 2021-03-01 10:43:13 +01:00
parent b6cd41d670
commit d7a786e8c8
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deps/wxWidgets/wxWidgets.cmake vendored
View File

@ -1,11 +1,4 @@
if (APPLE) set(_wx_git_tag v3.1.4-patched)
# 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(_patch_command "") # set(_patch_command "")
set(_wx_toolkit "") set(_wx_toolkit "")

6
src/libslic3r/Geometry.cpp
View File

@ -245,8 +245,7 @@ Polygon convex_hull(Points points)
return hull; return hull;
} }
Pointf3s Pointf3s convex_hull(Pointf3s points)
convex_hull(Pointf3s points)
{ {
assert(points.size() >= 3); assert(points.size() >= 3);
// sort input points // sort input points
@ -304,8 +303,7 @@ convex_hull(Pointf3s points)
return hull; return hull;
} }
Polygon Polygon convex_hull(const Polygons &polygons)
convex_hull(const Polygons &polygons)
{ {
Points pp; Points pp;
for (Polygons::const_iterator p = polygons.begin(); p != polygons.end(); ++p) { for (Polygons::const_iterator p = polygons.begin(); p != polygons.end(); ++p) {