Salome HOME
small fix after merge of a fix from V7_main : the variable shape was defined in anoth... V7_2_1
authorrnc <rnc@opencascade.com>
Mon, 1 Jul 2013 10:04:46 +0000 (10:04 +0000)
committerrnc <rnc@opencascade.com>
Mon, 1 Jul 2013 10:04:46 +0000 (10:04 +0000)
So sm->GetSubShape() is used in this branch instead of this shape variable ( =sm->GetSubShape() ).

src/StdMeshers/StdMeshers_ProjectionUtils.cxx

index 4a8ba8229c56ba03e9a294348e49f594dad40087..83b75705b569570a4aa6764fb7458cd975c3cf1d 100644 (file)
@@ -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;