From: duv <duv@opencascade.com>
Date: Tue, 14 Jul 2015 14:37:27 +0000 (+0300)
Subject: 0026434: Textured objects should have priority over the environment mapping
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=78bf282ae13ade7ecf40e46b4f67784aade64c36;p=occt-copy.git

0026434: Textured objects should have priority over the environment mapping
---

diff --git a/src/OpenGl/OpenGl_Workspace_5.cxx b/src/OpenGl/OpenGl_Workspace_5.cxx
index d4b61e4212..bf132a35ca 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;