From: mkr Date: Mon, 30 Jan 2012 12:07:56 +0000 (+0000) Subject: Fix regression (after fix for PAL21179): X-Git-Tag: V6_5_0a1~82 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=50c7a4428dc4d3eaa1b362af234210ff7ff7f64f;p=modules%2Fgeom.git Fix regression (after fix for PAL21179): 1) VTK viewer: change edges color for wireframe mode after change the color of the shape. --- diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx index 3e2d7a1b1..318ea45b8 100644 --- a/src/OBJECT/GEOM_Actor.cxx +++ b/src/OBJECT/GEOM_Actor.cxx @@ -687,6 +687,8 @@ void GEOM_Actor::SetColor(vtkFloatingPointType r,vtkFloatingPointType g,vtkFloat myOneFaceEdgeActor->GetProperty()->SetColor(r,g,b); // standalone face edge color (Wireframe) mySharedEdgeActor->GetProperty()->SetColor(r,g,b); // share edge color (Wireframe) } + + StoreBoundaryColors(); } void GEOM_Actor::GetColor(vtkFloatingPointType& r,vtkFloatingPointType& g,vtkFloatingPointType& b) @@ -1008,7 +1010,8 @@ void GEOM_Actor::ResetIsoNumbers() void GEOM_Actor::StoreBoundaryColors() { - mySharedEdgeActor->GetProperty()->GetColor(myEdgesInWireframeColor); + myShadingFaceProp->GetColor(myEdgesInWireframeColor); + } void GEOM_Actor::RestoreBoundaryColors()