From 8790b4de04cfa5951d443125e623a2c59890b1a4 Mon Sep 17 00:00:00 2001 From: ana Date: Wed, 6 Feb 2013 13:01:06 +0000 Subject: [PATCH] "0021391: EDF 1630 GEOM: Specific color when editing a group" issue: small fix associated with physical materials. --- src/GEOMGUI/GEOM_Displayer.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index ca4134545..4b362a702 100644 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -597,7 +597,9 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap // set material Material_Model material; - material.fromProperties( propMap.value( GEOM::propertyName( GEOM::Material ) ).toString() ); + // if predefined color isn't set in displayer(via GEOM_Displayer::SetColor() function) + if( !HasColor() ) + material.fromProperties( propMap.value( GEOM::propertyName( GEOM::Material ) ).toString() ); // - set front material properties AISShape->SetCurrentFacingModel( Aspect_TOFM_FRONT_SIDE ); AISShape->SetMaterial( material.getMaterialOCCAspect( true ) ); -- 2.39.2