Merge branch 'master' into gni/adaptation

diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx
index 4c2ca27c376ae82080db24f1d997fa6444a7a8aa..97687ae79842fa0fb4ea98b578c01cf73b674be1 100644 (file)
--- a/src/SMESH_I/SMESH_Mesh_i.cxx
+++ b/src/SMESH_I/SMESH_Mesh_i.cxx
@@ -2052,8 +2052,7 @@ void SMESH_Mesh_i::ReplaceShape(GEOM::GEOM_Object_ptr theNewGeom)
   bool geomChanged = true;
   GEOM::GEOM_Object_var oldGeom = GetShapeToMesh();
   if ( !theNewGeom->_is_nil() && !oldGeom->_is_nil() )
-    geomChanged = ( //oldGeom->_is_equivalent( theNewGeom ) ||
-                   oldGeom->GetTick() < theNewGeom->GetTick() );
+    geomChanged = ( oldGeom->GetTick() != theNewGeom->GetTick() );
 
   TopoDS_Shape S = _impl->GetShapeToMesh();
   GEOM_Client* geomClient = _gen_i->GetShapeReader();

diff --git a/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx b/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx
index 678ae97ee392fe3631719daa73240bb35e864915..8f624c777867ebb71336b405cee6cccad5f88337 100644 (file)
--- a/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx
+++ b/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx
@@ -2094,7 +2094,7 @@ bool _FaceSide::StoreNodes(SMESH_ProxyMesh&              mesh,
                                            smToCheckEdges, mesh ))
             break;
           else
-            nodes.erase( --( u_node1.base() ));
+            nodes.erase( --(( u_node2 = u_node1 ).base() ));
       }
     }