0023035: TKOpenGl redesign regression caused by destruction of global OpenGl_Display...

Do not destroy global openglDisplay instance

diff --git a/src/OpenGl/OpenGl_GraphicDriver_1.cxx b/src/OpenGl/OpenGl_GraphicDriver_1.cxx
index 9189043108028e85e02f276acdf86864853d73c6..fb963ab952f8d2c4941c7a2853d48a39dd828eb1 100755 (executable)
--- a/src/OpenGl/OpenGl_GraphicDriver_1.cxx
+++ b/src/OpenGl/OpenGl_GraphicDriver_1.cxx
@@ -69,7 +69,10 @@ Standard_Boolean OpenGl_GraphicDriver::Begin (const Aspect_Display ADisplay)
 
 void OpenGl_GraphicDriver::End ()
 {
-  openglDisplay.Nullify();
+  // This is unsafe to realease global object here
+  // because noone guaranteed that only one instance of OpenGl_GraphicDriver is used!
+  // So we disable this destructor here until openglDisplay not moved to  OpenGl_GraphicDriver class definition.
+  ///openglDisplay.Nullify();
 }
 
 //=======================================================================

diff --git a/src/OpenGl/OpenGl_telem_view.cxx b/src/OpenGl/OpenGl_telem_view.cxx
index e5075f5589365509bfbd78cb3f0c7656cb480090..c751245f82061f490dcc43ce83c8f5e27a14291c 100644 (file)
--- a/src/OpenGl/OpenGl_telem_view.cxx
+++ b/src/OpenGl/OpenGl_telem_view.cxx
@@ -85,7 +85,7 @@ EvalViewMappingMatrix( tel_view_mapping mapping /* View Mapping */,
   }
 
   /* prp between front and back planes */
-  if (!openglDisplay.IsNull() || !openglDisplay->Walkthrough())
+  if (openglDisplay.IsNull() || !openglDisplay->Walkthrough())
   {
     if( mapping->prp[2] < mapping->fpd &&
       mapping->prp[2] > mapping->bpd )