ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-24 06:30:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into gni/adaptation

Browse Source
This commit is contained in:
Gérald NICOLAS 2020-09-09 11:00:25 +02:00
commit 4f27d56bda
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/SMESH_I/SMESH_Mesh_i.cxx
View File

@ -2052,8 +2052,7 @@ void SMESH_Mesh_i::ReplaceShape(GEOM::GEOM_Object_ptr theNewGeom)
bool geomChanged = true; bool geomChanged = true;
GEOM::GEOM_Object_var oldGeom = GetShapeToMesh(); GEOM::GEOM_Object_var oldGeom = GetShapeToMesh();
if ( !theNewGeom->_is_nil() && !oldGeom->_is_nil() ) if ( !theNewGeom->_is_nil() && !oldGeom->_is_nil() )
geomChanged = ( //oldGeom->_is_equivalent( theNewGeom ) || geomChanged = ( oldGeom->GetTick() != theNewGeom->GetTick() );
oldGeom->GetTick() < theNewGeom->GetTick() );
TopoDS_Shape S = _impl->GetShapeToMesh(); TopoDS_Shape S = _impl->GetShapeToMesh();
GEOM_Client* geomClient = _gen_i->GetShapeReader(); GEOM_Client* geomClient = _gen_i->GetShapeReader();

2
src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx
View File

@ -2094,7 +2094,7 @@ bool _FaceSide::StoreNodes(SMESH_ProxyMesh& mesh,
smToCheckEdges, mesh )) smToCheckEdges, mesh ))
break; break;
else else
nodes.erase( --( u_node1.base() )); nodes.erase( --(( u_node2 = u_node1 ).base() ));
} }
} }