sync ports with The Matrix

This commit is contained in:
purplerain 2023-09-14 00:49:35 +00:00
parent 9d4d2e721a
commit 79bc6d9d97
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
846 changed files with 10693 additions and 8131 deletions

View file

@ -0,0 +1,12 @@
Index: src/slic3r/GUI/GLCanvas3D.cpp
--- src/slic3r/GUI/GLCanvas3D.cpp.orig
+++ src/slic3r/GUI/GLCanvas3D.cpp
@@ -96,7 +96,7 @@ float RetinaHelper::get_scale_factor() { return float(
#endif // __WXGTK3__
// Fixed the collision between BuildVolume::Type::Convex and macro Convex defined inside /usr/include/X11/X.h that is included by WxWidgets 3.0.
-#if defined(__linux__) && defined(Convex)
+#if (defined(__linux__) || defined(__OpenBSD__)) && defined(Convex)
#undef Convex
#endif