Salome HOME
Merge remote-tracking branch 'origin/master' into V8_5_BR V8_5_0rc1
authorrnv <rnv@opencascade.com>
Mon, 23 Apr 2018 16:06:30 +0000 (19:06 +0300)
committerrnv <rnv@opencascade.com>
Mon, 23 Apr 2018 16:06:30 +0000 (19:06 +0300)
src/SMDS/SMDS_Mesh.cxx
src/SMESH_I/SMESH_2smeshpy.cxx

index 43a48eb..bb3ecb8 100644 (file)
@@ -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 ));
 
index 75c9766..b0d415b 100644 (file)
@@ -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() )