From: eap <eap@opencascade.com>
Date: Fri, 17 Sep 2010 05:36:15 +0000 (+0000)
Subject: 0020982: EDF 1547 SMESH: Creation of non-conformal quadratic pyramids
X-Git-Tag: V5_1_5a1~39
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e350ffef91f9c13e43046073a96f6c75f96a1c17;p=modules%2Fsmesh.git

0020982: EDF 1547 SMESH: Creation of non-conformal quadratic pyramids
-    if ( !subMeshId )
+    if ( !subMeshId && ! _impl->GetMeshDS()->IsGroupOfSubShapes( myLocSubShape ))
       THROW_SALOME_CORBA_EXCEPTION("not sub-shape of the main shape", SALOME::BAD_PARAM);
---

diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx
index a38a8f9ba..83dd619f5 100644
--- a/src/SMESH_I/SMESH_Mesh_i.cxx
+++ b/src/SMESH_I/SMESH_Mesh_i.cxx
@@ -655,8 +655,9 @@ SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::GetSubMesh(GEOM::GEOM_Object_ptr aSubShap
     //Get or Create the SMESH_subMesh object implementation
 
     int subMeshId = _impl->GetMeshDS()->ShapeToIndex( myLocSubShape );
-    if ( !subMeshId )
+    if ( !subMeshId && ! _impl->GetMeshDS()->IsGroupOfSubShapes( myLocSubShape ))
       THROW_SALOME_CORBA_EXCEPTION("not sub-shape of the main shape", SALOME::BAD_PARAM);
+
     subMesh = getSubMesh( subMeshId );
 
     // create a new subMesh object servant if there is none for the shape