Merge remote-tracking branch 'origin/master' into V8_5_BR

diff --git a/src/SMDS/SMDS_Mesh.cxx b/src/SMDS/SMDS_Mesh.cxx
index 43a48eb37f23095e4f666dd64df2ed7c84a93487..bb3ecb80f37b8dc29965ab9416fb4c5cc062621f 100644 (file)
--- a/src/SMDS/SMDS_Mesh.cxx
+++ b/src/SMDS/SMDS_Mesh.cxx
@@ -1831,6 +1831,7 @@ void SMDS_Mesh::RemoveElement(const SMDS_MeshElement *               elem,
     case SMDSAbs_All: // avoid compilation warning
     case SMDSAbs_NbElementTypes: break;
     }
+    removedElems.push_back( *it);
 
     myCellFactory->Free( static_cast< const SMDS_MeshCell*>( *it ));
 

diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx
index 75c97665077cf12a0eda94a88d70a52410145eb9..b0d415b411fb7525867e8c2d07889e59572b6b08 100644 (file)
--- a/src/SMESH_I/SMESH_2smeshpy.cxx
+++ b/src/SMESH_I/SMESH_2smeshpy.cxx
@@ -5130,7 +5130,7 @@ int _pyStringFamily::isIn( const char* str )
       if (( len = itSub->isIn( str + itSub->_prefix.Length() )) >= 0 )
         return itSub->_prefix.Length() + len;
     }
-    else if ( cmp > 0 )
+    else if ( cmp < 0 )
       break;
   }
   if ( !_strings.empty() )