Merge from BR_new_bop4 (porting to new OCCT BOP) 13/09/2013

[modules/geom.git] / src / GEOMGUI / GEOM_Displayer.cxx

diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx
index c24f48306bafef1569c477f9653f7763bf351c6f..fca01937933bf472db9c3b6a095ce0be0103b75d 100644 (file)
--- a/src/GEOMGUI/GEOM_Displayer.cxx
+++ b/src/GEOMGUI/GEOM_Displayer.cxx
@@ -733,16 +733,27 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap
 #endif
         GeometryGUI::getTexture( study, textureId, aWidth, aHeight );
       if ( !aTexture.IsNull() ) {
-        static int TextureId = 0;
+#if OCC_VERSION_LARGE > 0x06060000 // Porting to OCCT higher 6.6.0 version
         Handle(Prs3d_PointAspect) aTextureAspect =
           new Prs3d_PointAspect( HasColor() ? 
-                                 // predefined color, manually set to displayer via GEOM_Displayer::SetColor() function
-                                 (Quantity_NameOfColor)GetColor() : 
-                                 // color from properties
+                                // predefined color, manually set to displayer via GEOM_Displayer::SetColor() function
+                                (Quantity_NameOfColor)GetColor() : 
+                                // color from properties 
                                  SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::PointColor ) ).value<QColor>() ),
-                                 ++TextureId,
                                  aWidth, aHeight,
                                  aTexture );
+#else
+       int TextureId = 0;
+        Handle(Prs3d_PointAspect) aTextureAspect =
+          new Prs3d_PointAspect( HasColor() ? 
+                                // predefined color, manually set to displayer via GEOM_Displayer::SetColor() function
+                                (Quantity_NameOfColor)GetColor() : 
+                                // color from properties 
+                                 SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::PointColor ) ).value<QColor>() ), 
+                                ++TextureId,
+                                 aWidth, aHeight,
+                                 aTexture );
+#endif
         AISShape->Attributes()->SetPointAspect( aTextureAspect );
       }
     }