From a1ea5512c3e9559f6e653e30c3de48e50110c560 Mon Sep 17 00:00:00 2001 From: inv Date: Fri, 6 Sep 2013 11:55:01 +0000 Subject: [PATCH] RNV: Fix compilation error. --- src/GEOMGUI/GEOM_Displayer.cxx | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index c24f48306..941793533 100644 --- 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 > 0x06050500 // Porting to OCCT higher 6.5.5 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() ), - ++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() ), + ++TextureId, + aWidth, aHeight, + aTexture ); +#endif AISShape->Attributes()->SetPointAspect( aTextureAspect ); } } -- 2.39.2