Merge branch 'master' into V7_5_BR

This commit is contained in:
vsr 2014-11-18 14:24:52 +03:00
commit e22a84e549

View File

@ -2353,7 +2353,7 @@ bool StdMeshers_Prism_3D::isSimpleBottom( const Prism_3D::TPrismTopo& thePrism )
TopoDS_Vertex commonV; TopoDS_Vertex commonV;
const list< TopoDS_Edge >& botEdges = thePrism.myBottomEdges; const list< TopoDS_Edge >& botEdges = thePrism.myBottomEdges;
list< TopoDS_Edge >::const_iterator edge = botEdges.begin(); list< TopoDS_Edge >::const_iterator edge = botEdges.begin();
for ( ; edge != botEdges.end(); ++edge ) while ( edge != botEdges.end() )
{ {
if ( SMESH_Algo::isDegenerated( *edge )) if ( SMESH_Algo::isDegenerated( *edge ))
return false; return false;