From 0c33a0bf4d320a4afef435687477636a570100b3 Mon Sep 17 00:00:00 2001 From: kgv Date: Sat, 22 Jun 2019 19:50:10 +0300 Subject: [PATCH] 0030748: Visualization - Marker displayed in immediate layer ruins QT Quick view controls OpenGl_Workspace::ResetAppliedAspect() now resets active texture unit to GL_TEXTURE0. --- src/OpenGl/OpenGl_Workspace.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/OpenGl/OpenGl_Workspace.cxx b/src/OpenGl/OpenGl_Workspace.cxx index 44451b4937..adfc4902da 100644 --- a/src/OpenGl/OpenGl_Workspace.cxx +++ b/src/OpenGl/OpenGl_Workspace.cxx @@ -204,6 +204,10 @@ void OpenGl_Workspace::ResetAppliedAspect() ApplyAspects(); myGlContext->SetTypeOfLine (myDefaultAspects.Aspect()->LineType()); myGlContext->SetLineWidth (myDefaultAspects.Aspect()->LineWidth()); + if (myGlContext->core15fwd != NULL) + { + myGlContext->core15fwd->glActiveTexture (GL_TEXTURE0); + } } // ======================================================================= -- 2.20.1