]> OCCT Git - occt-copy.git/commitdiff
0026434: Textured objects should have priority over the environment mapping
authorduv <duv@opencascade.com>
Tue, 14 Jul 2015 14:37:27 +0000 (17:37 +0300)
committeromy <omy@opencascade.com>
Mon, 31 Aug 2015 09:46:42 +0000 (12:46 +0300)
src/OpenGl/OpenGl_Workspace_5.cxx

index 485857690be802b25ecc67848245312d6be026bd..880254ad7f67601362d008b9071303806315188c 100644 (file)
@@ -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;