From 36ce8fe95432413171294bcb4f4655fec4f8e9b2 Mon Sep 17 00:00:00 2001 From: rnc Date: Mon, 1 Jul 2013 10:04:46 +0000 Subject: [PATCH] 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() ). --- src/StdMeshers/StdMeshers_ProjectionUtils.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx index 4a8ba8229..83b75705b 100644 --- a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx @@ -2064,7 +2064,7 @@ bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iter string algoType = algo->GetName(); 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 @@ -2096,7 +2096,7 @@ bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iter } } 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() )) RETURN_BAD_RESULT("Projection from self"); @@ -2105,7 +2105,7 @@ bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iter srcMesh = mesh; if ( MakeComputed( srcMesh->GetSubMesh( srcShape ), iterationNb + 1 ) && - gen->Compute( *mesh, shape, /*shapeOnly=*/true )) + gen->Compute( *mesh, sm->GetSubShape(), /*shapeOnly=*/true )) return sm->IsMeshComputed(); return false; -- 2.30.2