Path: blob/main/cad/OrcaSlicer/files/patch-src_slic3r_GUI_GLCanvas3D.cpp
46591 views
--- src/slic3r/GUI/GLCanvas3D.cpp.orig 2026-03-22 17:56:38 UTC1+++ src/slic3r/GUI/GLCanvas3D.cpp2@@ -108,7 +108,7 @@ float RetinaHelper::get_scale_factor() { return float(3#endif // __WXGTK3__45// Fixed the collision between BuildVolume_Type::Convex and macro Convex defined inside /usr/include/X11/X.h that is included by WxWidgets 3.0.6-#if defined(__linux__) && defined(Convex)7+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(Convex)8#undef Convex9#endif1011@@ -1938,7 +1938,11 @@ void GLCanvas3D::render(bool only_init)12return;1314// ensures this canvas is current and initialized15- if (!_is_shown_on_screen() || !_set_current() || !wxGetApp().init_opengl())16+ if (!_is_shown_on_screen())17+ return;18+ if (!_set_current())19+ return;20+ if (!wxGetApp().init_opengl())21return;2223if (!is_initialized() && !init())242526