}
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) ) )
{