Merge remote branch 'origin/master' into V9_3_BR

This commit is contained in:
vsr 2019-03-28 17:46:41 +03:00
commit 10f507591e

View File

@ -6427,11 +6427,15 @@ TListOfListOfInt SMESH_Mesh_i::findConcurrentSubMeshes()
aPythonDump << " ]"; aPythonDump << " ]";
subMeshOrder.push_back( subMeshIds ); subMeshOrder.push_back( subMeshIds );
// clear collected submeshes // clear collected sub-meshes
set<const SMESH_subMesh*>::iterator clrIt = subMeshToClear.begin(); set<const SMESH_subMesh*>::iterator clrIt = subMeshToClear.begin();
for ( ; clrIt != subMeshToClear.end(); clrIt++ ) for ( ; clrIt != subMeshToClear.end(); clrIt++ )
if ( SMESH_subMesh* sm = (SMESH_subMesh*)*clrIt ) if ( SMESH_subMesh* sm = (SMESH_subMesh*)*clrIt )
{
sm->ComputeStateEngine( SMESH_subMesh::CLEAN ); sm->ComputeStateEngine( SMESH_subMesh::CLEAN );
if ( SMESH_Algo* algo = sm->GetAlgo() ) // #16748
sm->AlgoStateEngine( SMESH_subMesh::MODIF_HYP, algo ); // to clear a cached algo
}
} }
aPythonDump << " ])"; aPythonDump << " ])";