From: kgv <kgv@opencascade.com>
Date: Sat, 22 Jun 2019 16:50:10 +0000 (+0300)
Subject: 0030748: Visualization - Marker displayed in immediate layer ruins QT Quick view... 
X-Git-Tag: V7_4_0_beta~104
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=0c33a0bf4d320a4afef435687477636a570100b3;p=occt-copy.git

0030748: Visualization - Marker displayed in immediate layer ruins QT Quick view controls

OpenGl_Workspace::ResetAppliedAspect() now resets active texture unit to GL_TEXTURE0.
---

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);
+  }
 }
 
 // =======================================================================