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

Corrected the error in selection.h that broke the build....

This commit is contained in:
Paolo Cignoni 2017-06-16 11:29:38 +02:00
parent f8c6030b2a
commit ed54491d10
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/update/selection.h
View File

@ -84,6 +84,8 @@ public:
bool pop(bool orFlag=false, bool andFlag=false) bool pop(bool orFlag=false, bool andFlag=false)
{ {
if(vsV.empty()) return false; if(vsV.empty()) return false;
if(orFlag && andFlag) return false;
vsHandle vsH = vsV.back(); vsHandle vsH = vsV.back();
esHandle esH = esV.back(); esHandle esH = esV.back();
fsHandle fsH = fsV.back(); fsHandle fsH = fsV.back();
@ -102,7 +104,7 @@ public:
for(auto ei = _m->edge.begin(); ei != _m->edge.end(); ++ei) for(auto ei = _m->edge.begin(); ei != _m->edge.end(); ++ei)
if( !(*ei).IsD() ) if( !(*ei).IsD() )
{ {
if(vsH[*ei]) { if(esH[*ei]) {
if(!andFlag) (*ei).SetS(); if(!andFlag) (*ei).SetS();
} else { } else {
if(!orFlag) (*ei).ClearS(); if(!orFlag) (*ei).ClearS();
@ -113,7 +115,7 @@ public:
for(auto fi = _m->face.begin(); fi != _m->face.end(); ++fi) for(auto fi = _m->face.begin(); fi != _m->face.end(); ++fi)
if( !(*fi).IsD() ) if( !(*fi).IsD() )
{ {
if(vsH[*fi]) { if(fsH[*fi]) {
if(!andFlag) (*fi).SetS(); if(!andFlag) (*fi).SetS();
} else { } else {
if(!orFlag) (*fi).ClearS(); if(!orFlag) (*fi).ClearS();