From: isn <isn@opencascade.com>
Date: Wed, 25 Nov 2015 15:41:42 +0000 (+0300)
Subject: Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into... 
X-Git-Tag: v1.5~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a788bfd4c2a20a16aec0a1a5f456dd9d4600ae7b;p=modules%2Fhydro.git

Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

Conflicts:
	src/HYDROData/HYDROData_LandCoverMap.cxx
---

a788bfd4c2a20a16aec0a1a5f456dd9d4600ae7b
diff --cc src/HYDROData/HYDROData_LandCoverMap.cxx
index be2f26ad,677cd677..3cc968d5
--- a/src/HYDROData/HYDROData_LandCoverMap.cxx
+++ b/src/HYDROData/HYDROData_LandCoverMap.cxx
@@@ -735,9 -726,26 +735,8 @@@ TopoDS_Shape HYDROData_LandCoverMap::Me
      }
    }
  
 -  if (!EmptySh)
 -    aSeqSh.Append (ShellR);
 -  
 -  TopoDS_Compound cmp; 
 -  BB.MakeCompound( cmp ); 
 -  
 -  TopoDS_Shape aResult;
 -
 -  if (aSeqSh.Length() == 1)
 -    aResult = aSeqSh.First();
 -  else
 -  {
 -    for (int i = 1; i <= aSeqSh.Size(); i++)
 -      BB.Add(cmp, aSeqSh(i));
 -    aResult = cmp;
 -  }
 -
    return aResult;
  }
--
  /**
    Change Strickler type for the list of faces to the given one
    @param theFaces the faces to change type