ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-14 21:20:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from 1.4.2.10

Browse Source
This commit is contained in:
rnc 2013-07-01 08:32:59 +00:00
parent 325ce25ce8
commit 83ca68bb06
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
View File

@ -2064,7 +2064,7 @@ bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iter
string algoType = algo->GetName(); string algoType = algo->GetName();
if ( algoType.substr(0, 11) != "Projection_") if ( algoType.substr(0, 11) != "Projection_")
return gen->Compute( *mesh, sm->GetSubShape() ); return gen->Compute( *mesh, shape, /*shapeOnly=*/true );
// try to compute source mesh // try to compute source mesh
@ -2096,7 +2096,7 @@ bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iter
} }
} }
if ( srcShape.IsNull() ) // no projection source defined if ( srcShape.IsNull() ) // no projection source defined
return gen->Compute( *mesh, sm->GetSubShape() ); return gen->Compute( *mesh, shape, /*shapeOnly=*/true );
if ( srcShape.IsSame( sm->GetSubShape() )) if ( srcShape.IsSame( sm->GetSubShape() ))
RETURN_BAD_RESULT("Projection from self"); RETURN_BAD_RESULT("Projection from self");
@ -2105,7 +2105,7 @@ bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iter
srcMesh = mesh; srcMesh = mesh;
if ( MakeComputed( srcMesh->GetSubMesh( srcShape ), iterationNb + 1 ) && if ( MakeComputed( srcMesh->GetSubMesh( srcShape ), iterationNb + 1 ) &&
gen->Compute( *mesh, sm->GetSubShape() )) gen->Compute( *mesh, shape, /*shapeOnly=*/true ))
return sm->IsMeshComputed(); return sm->IsMeshComputed();
return false; return false;