3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-25 15:44:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ENH: CLI: don't popup dialog when loading shader failed

Browse source 
STUDIO-2855(github issue-1703)

Change-Id: I46476e94951aa2337fee3439159e777773366c59
This commit is contained in:
lane.wei 2023-05-04 15:56:16 +08:00 • committed by Lane.Wei
parent 8dae5b6980
commit 33ae019a95
3 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/OpenGLManager.hpp
View file

@ -54,7 +54,7 @@ public:
void detect() const;
};
#ifdef __APPLE__
#ifdef __APPLE__
// Part of hack to remove crash when closing the application on OSX 10.9.5 when building against newer wxWidgets
struct OSInfo
{
@ -76,7 +76,7 @@ private:
wxGLContext* m_context{ nullptr };
GLShadersManager m_shaders_manager;
static GLInfo s_gl_info;
#ifdef __APPLE__
#ifdef __APPLE__
// Part of hack to remove crash when closing the application on OSX 10.9.5 when building against newer wxWidgets
static OSInfo s_os_info;
#endif //__APPLE__
@ -89,7 +89,7 @@ public:
OpenGLManager() = default;
~OpenGLManager();
bool init_gl();
bool init_gl(bool popup_error = true);
wxGLContext* init_glcontext(wxGLCanvas& canvas);
GLShaderProgram* get_shader(const std::string& shader_name) { return m_shaders_manager.get_shader(shader_name); }