From 94a460080e306ba9570b61d28c204c35167eebc5 Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Fri, 3 Jun 2016 15:46:12 +0200 Subject: [PATCH] Added missing code for C3D_MODEL_VIEWER to use GL_CONTEXT_MANAGER. --- 3d-viewer/3d_model_viewer/c3d_model_viewer.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/3d-viewer/3d_model_viewer/c3d_model_viewer.cpp b/3d-viewer/3d_model_viewer/c3d_model_viewer.cpp index 4d2aa4df15..64aef1c33b 100644 --- a/3d-viewer/3d_model_viewer/c3d_model_viewer.cpp +++ b/3d-viewer/3d_model_viewer/c3d_model_viewer.cpp @@ -95,19 +95,20 @@ C3D_MODEL_VIEWER::C3D_MODEL_VIEWER( wxWindow *aParent, m_BiuTo3Dunits = 1.0; // Explicitly create a new rendering context instance for this canvas. - m_glRC = new wxGLContext( this ); + m_glRC = GL_CONTEXT_MANAGER::Get().CreateCtx( this ); } C3D_MODEL_VIEWER::~C3D_MODEL_VIEWER() { + GL_CONTEXT_MANAGER::Get().LockCtx( m_glRC ); + wxLogTrace( m_logTrace, wxT( "C3D_MODEL_VIEWER::~C3D_MODEL_VIEWER" ) ); delete m_ogl_3dmodel; m_ogl_3dmodel = NULL; - delete m_glRC; - m_glRC = NULL; + GL_CONTEXT_MANAGER::Get().UnlockCtx( m_glRC ); }