X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Shape.cxx;h=9a6c0ca700144bd562ff588259b0508e277063a9;hb=de7cf9bb0a7a41d6487013c87f4a54d0664cd303;hp=1ac88c741e745cc36bcc26dc7be4b0263ad64eb0;hpb=dadcea132a8b5df65f63168ecdc59b245c374b8b;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Shape.cxx b/src/HYDROGUI/HYDROGUI_Shape.cxx
index 1ac88c74..9a6c0ca7 100644
--- a/src/HYDROGUI/HYDROGUI_Shape.cxx
+++ b/src/HYDROGUI/HYDROGUI_Shape.cxx
@@ -162,7 +162,15 @@ void HYDROGUI_Shape::update( const bool theIsUpdateViewer )
       }
        
       setFace( aZoneFace, false, false );
-      setFillingColor( HYDROGUI_Tool::GenerateFillingColor( aDocument, aGeomObjectsNames ) );
+      if (aZone->IsMergingNeed() && aZone->GetMergeType() == HYDROData_Zone::Merge_UNKNOWN )
+      {
+        // Red color for a zone with bathymetry conflict
+        setFillingColor( Qt::red );
+      }
+      else
+      {
+        setFillingColor( HYDROGUI_Tool::GenerateFillingColor( aDocument, aGeomObjectsNames ) );
+      }
     }
     else if ( myObject->IsKind( STANDARD_TYPE(HYDROData_Image) ) )
     {