Merge from V6_5_BR 05/06/2012

[modules/smesh.git] / src / StdMeshers / StdMeshers_ImportSource.cxx

diff --git a/src/StdMeshers/StdMeshers_ImportSource.cxx b/src/StdMeshers/StdMeshers_ImportSource.cxx
index 5e963a02d96401edf200001bed5df2819f07ccd8..e93b83a61e3a218d64972d1c99103413aa14b3da 100644 (file)
--- a/src/StdMeshers/StdMeshers_ImportSource.cxx
+++ b/src/StdMeshers/StdMeshers_ImportSource.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -268,8 +268,10 @@ std::vector<SMESH_subMesh*>
 StdMeshers_ImportSource1D::GetSourceSubMeshes(const SMESH_Mesh* srcMesh) const
 {
   if ( !srcMesh->HasShapeToMesh() )
-    return vector<SMESH_subMesh*>(1, srcMesh->GetSubMeshContaining(1));
-
+  {
+    SMESH_Mesh* srcM = const_cast< SMESH_Mesh* >( srcMesh );
+    return vector<SMESH_subMesh*>(1, srcM->GetSubMesh( srcM->GetShapeToMesh()));
+  }
   set<int> shapeIDs;
   const vector<SMESH_Group*>& groups = GetGroups();
   const SMESHDS_Mesh * srcMeshDS = srcMesh->GetMeshDS();