Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_main (04/10/2012)
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Projection_2D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Projection_2D.cxx
b/src/StdMeshers/StdMeshers_Projection_2D.cxx
index b4734fa0c6c531b40b0c82d3f3a94c75c1338cfd..60917a9fcd4be63af82cf9d32e1dcbd1de7a2031 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Projection_2D.cxx
+++ b/
src/StdMeshers/StdMeshers_Projection_2D.cxx
@@
-72,8
+72,6
@@
StdMeshers_Projection_2D::StdMeshers_Projection_2D(int hypId, int studyId, SMESH
:SMESH_2D_Algo(hypId, studyId, gen)
{
_name = "Projection_2D";
:SMESH_2D_Algo(hypId, studyId, gen)
{
_name = "Projection_2D";
- _shapeType = (1 << TopAbs_FACE); // 1 bit per shape type
-
_compatibleHypothesis.push_back("ProjectionSource2D");
_sourceHypo = 0;
}
_compatibleHypothesis.push_back("ProjectionSource2D");
_sourceHypo = 0;
}
@@
-808,7
+806,7
@@
bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
SMESH_subMesh* tgtSubMesh = tgtMesh->GetSubMesh( tgtFace );
if ( tgtMesh == srcMesh ) {
SMESH_subMesh* tgtSubMesh = tgtMesh->GetSubMesh( tgtFace );
if ( tgtMesh == srcMesh ) {
- if ( !TAssocTool::MakeComputed( srcSubMesh ))
+ if ( !TAssocTool::MakeComputed( srcSubMesh )
|| !srcSubMesh->IsMeshComputed()
)
return error(COMPERR_BAD_INPUT_MESH,"Source mesh not computed");
}
else {
return error(COMPERR_BAD_INPUT_MESH,"Source mesh not computed");
}
else {