mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-27 09:50:34 +05:00
small fix after merge of a fix from V7_main : the variable shape was defined in another commit which is not included in this branch.
So sm->GetSubShape() is used in this branch instead of this shape variable ( =sm->GetSubShape() ).
This commit is contained in:
parent
83ca68bb06
commit
36ce8fe954
@ -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, shape, /*shapeOnly=*/true );
|
return gen->Compute( *mesh, sm->GetSubShape(), /*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, shape, /*shapeOnly=*/true );
|
return gen->Compute( *mesh, sm->GetSubShape(), /*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, shape, /*shapeOnly=*/true ))
|
gen->Compute( *mesh, sm->GetSubShape(), /*shapeOnly=*/true ))
|
||||||
return sm->IsMeshComputed();
|
return sm->IsMeshComputed();
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user