From: ana <ana@opencascade.com>
Date: Wed, 6 Feb 2013 13:01:06 +0000 (+0000)
Subject: "0021391: EDF 1630 GEOM: Specific color when editing a group" issue: small fix associ... 
X-Git-Tag: V6_main_FINAL~43
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8790b4de04cfa5951d443125e623a2c59890b1a4;p=modules%2Fgeom.git

"0021391: EDF 1630 GEOM: Specific color when editing a group" issue: small fix associated with physical materials.
---

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 ) );