Merge branch 'et_opengl_3_rebase' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_opengl_es_rebase
This commit is contained in:
commit
1459eea8d6
1 changed files with 2 additions and 1 deletions
|
@ -849,7 +849,8 @@ wxGLContext* GUI_App::init_glcontext(wxGLCanvas& canvas)
|
|||
{
|
||||
#if ENABLE_GL_CORE_PROFILE
|
||||
#if ENABLE_OPENGL_DEBUG_OPTION
|
||||
return m_opengl_mgr.init_glcontext(canvas, init_params != nullptr ? init_params->opengl_version : std::make_pair(0, 0), init_params->opengl_debug);
|
||||
return m_opengl_mgr.init_glcontext(canvas, init_params != nullptr ? init_params->opengl_version : std::make_pair(0, 0),
|
||||
init_params != nullptr ? init_params->opengl_debug : false);
|
||||
#else
|
||||
return m_opengl_mgr.init_glcontext(canvas, init_params != nullptr ? init_params->opengl_version : std::make_pair(0, 0));
|
||||
#endif // ENABLE_OPENGL_DEBUG_OPTION
|
||||
|
|
Loading…
Add table
Reference in a new issue