From 7c1069c01cd269736c193cedf0829d8cb1d265c6 Mon Sep 17 00:00:00 2001
From: duv <duv@opencascade.com>
Date: Tue, 14 Jul 2015 17:37:27 +0300
Subject: [PATCH] 0026434: Textured objects should have priority over the
 environment mapping

---
 src/OpenGl/OpenGl_Workspace_5.cxx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/OpenGl/OpenGl_Workspace_5.cxx b/src/OpenGl/OpenGl_Workspace_5.cxx
index 485857690b..880254ad7f 100644
--- a/src/OpenGl/OpenGl_Workspace_5.cxx
+++ b/src/OpenGl/OpenGl_Workspace_5.cxx
@@ -407,6 +407,14 @@ const OpenGl_AspectFace* OpenGl_Workspace::AspectFace (const Standard_Boolean th
       DisableTexture();
     }
   }
+  else
+  {
+    if (AspectFace_set->DoTextureMap())
+    {
+      EnableTexture (AspectFace_set->TextureRes (myGlContext),
+                     AspectFace_set->TextureParams());
+    }
+  }
 
   AspectFace_applied = AspectFace_set;
   return AspectFace_set;
-- 
2.39.5