From e43a4f2bd9ae324b8955bb466b3a1b3e70dbe68f Mon Sep 17 00:00:00 2001
From: kgv <kgv@opencascade.com>
Date: Thu, 27 Aug 2015 13:49:39 +0300
Subject: [PATCH] 0026599: Visualization, TKOpenGl - gradient background should
 reset model transformation in Core profile

OpenGl_View::DrawBackground() - reset ModelWorldState as wellm not just WorldViewState.
Test case for issue CR26599
---
 src/OpenGl/OpenGl_View_2.cxx | 11 +++++++----
 tests/bugs/vis/bug26599      | 27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100755 tests/bugs/vis/bug26599

diff --git a/src/OpenGl/OpenGl_View_2.cxx b/src/OpenGl/OpenGl_View_2.cxx
index 0fedacbe49..73f874cd22 100644
--- a/src/OpenGl/OpenGl_View_2.cxx
+++ b/src/OpenGl/OpenGl_View_2.cxx
@@ -173,12 +173,14 @@ void OpenGl_View::DrawBackground (const Handle(OpenGl_Workspace)& theWorkspace)
     aCtx->core11fwd->glDisable (GL_DEPTH_TEST);
   }
 
-  aCtx->WorldViewState.Push();
   aCtx->ProjectionState.Push();
-  aCtx->WorldViewState.SetIdentity();
+  aCtx->WorldViewState.Push();
+  aCtx->ModelWorldState.Push();
   aCtx->ProjectionState.SetIdentity();
+  aCtx->WorldViewState.SetIdentity();
+  aCtx->ModelWorldState.SetIdentity();
   aCtx->ApplyProjectionMatrix();
-  aCtx->ApplyWorldViewMatrix();
+  aCtx->ApplyModelViewMatrix();
 
   // Drawing background gradient if:
   // - gradient fill type is not Aspect_GFM_NONE and
@@ -234,10 +236,11 @@ void OpenGl_View::DrawBackground (const Handle(OpenGl_Workspace)& theWorkspace)
     theWorkspace->SetAspectFace (anOldAspectFace);
   }
 
+  aCtx->ModelWorldState.Pop();
   aCtx->WorldViewState.Pop();
   aCtx->ProjectionState.Pop();
   aCtx->ApplyProjectionMatrix();
-  aCtx->ApplyWorldViewMatrix();
+  aCtx->ApplyModelViewMatrix();
 
   if (wasUsedZBuffer)
   {
diff --git a/tests/bugs/vis/bug26599 b/tests/bugs/vis/bug26599
new file mode 100755
index 0000000000..36ea93dbd5
--- /dev/null
+++ b/tests/bugs/vis/bug26599
@@ -0,0 +1,27 @@
+puts "============"
+puts "CR26599"
+puts "============"
+puts ""
+
+##########################################################################################
+# Visualization, TKOpenGl - gradient background should reset model transformation in Core profile
+##########################################################################################
+
+vcaps -ffp 0
+
+vinit View1
+vclear
+vaxo
+
+vsetgradientbg 255 0 0 0 0 255 2
+box b 1 2 3
+vdisplay b
+
+vfit
+
+vlocrotate b 0 0 0 0 0 1 50
+
+vmoveto 380 50
+checkcolor 380 50 0.87450981140136719 0 0.12156862765550613
+
+vdump ${imagedir}/${casename}.png