manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Corrected missing return value in SelectIntersectingFaces

This commit is contained in:
Paolo Cignoni 2017-04-12 07:38:19 +02:00
parent ce5f87188b
commit db0a01af70
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vcg/complex/algorithms/clean.h
View File

@ -1826,7 +1826,7 @@ public:
Select the faces on the first mesh that intersect the second mesh. Select the faces on the first mesh that intersect the second mesh.
It uses a grid for querying so a face::mark should be added. It uses a grid for querying so a face::mark should be added.
*/ */
static bool SelectIntersectingFaces(MeshType &m1, MeshType &m2) static int SelectIntersectingFaces(MeshType &m1, MeshType &m2)
{ {
RequirePerFaceMark(m2); RequirePerFaceMark(m2);
RequireCompactness(m1); RequireCompactness(m1);
@ -1836,7 +1836,7 @@ public:
TriMeshGrid gM; TriMeshGrid gM;
gM.Set(m2.face.begin(),m2.face.end()); gM.Set(m2.face.begin(),m2.face.end());
int selCnt=0;
for(auto fi=m1.face.begin();fi!=m1.face.end();++fi) for(auto fi=m1.face.begin();fi!=m1.face.end();++fi)
{ {
Box3< ScalarType> bbox; Box3< ScalarType> bbox;
@ -1847,10 +1847,12 @@ public:
{ {
if(Clean<MeshType>::TestFaceFaceIntersection(&*fi,*fib)){ if(Clean<MeshType>::TestFaceFaceIntersection(&*fi,*fib)){
fi->SetS(); fi->SetS();
++selCnt;
} }
} }
inBox.clear(); inBox.clear();
} }
return selCnt;
} }
}; // end class }; // end class