From: eap <eap@opencascade.com>
Date: Mon, 19 Nov 2012 16:26:52 +0000 (+0000)
Subject: 0021988: EDF 2484 SMESH : NETGEN and GDHS3D/BLSURF mixed meshes
X-Git-Tag: V6_6_0rc1~29
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=46c3fa32c4d4b1d5d8540a4aee609b81c7abb388;p=modules%2Fsmesh.git

0021988: EDF 2484 SMESH : NETGEN and GDHS3D/BLSURF mixed meshes

  Fix checkConformIgnoredAlgos()
---

diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx
index 4a31ee0db..e34ae9828 100644
--- a/src/SMESH/SMESH_Gen.cxx
+++ b/src/SMESH/SMESH_Gen.cxx
@@ -585,7 +585,8 @@ static bool checkConformIgnoredAlgos(SMESH_Mesh&               aMesh,
       int dim = algo->GetDim();
       int aMaxGlobIgnoDim = ( aGlobIgnoAlgo ? aGlobIgnoAlgo->GetDim() : -1 );
 
-      if ( dim < aMaxGlobIgnoDim )
+      if ( dim < aMaxGlobIgnoDim &&
+           ( isGlobal || !aGlobIgnoAlgo->SupportSubmeshes() ))
       {
         // algo is hidden by a global algo
         theErrors.push_back( SMESH_Gen::TAlgoStateError() );
@@ -812,7 +813,8 @@ bool SMESH_Gen::GetAlgoState(SMESH_Mesh&               theMesh,
   for (dim = 3; dim > 0; dim--)
   {
     if (aGlobAlgoArr[ dim ] &&
-        !aGlobAlgoArr[ dim ]->NeedDiscreteBoundary())
+        !aGlobAlgoArr[ dim ]->NeedDiscreteBoundary() /*&&
+        !aGlobAlgoArr[ dim ]->SupportSubmeshes()*/ )
     {
       aGlobIgnoAlgo = aGlobAlgoArr[ dim ];
       break;