lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-16 01:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed a dead lock

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2007-09-21 09:58:43 +00:00
parent 2763f2b4b8
commit 7785b2ab44
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/meshlabplugins/editsegment/cutting.h
View File

@ -274,18 +274,21 @@ namespace vcg {
queue<FaceType*> edgeFaceQueue;
for (vi = mesh->vert.begin(); vi != mesh->vert.end(); ++vi) {
if ( (*TDMarkPtr)[(*vi)].Mark == F ) vi->C() = Color4b::Magenta;
if ( (*TDMarkPtr)[(*vi)].Mark == F ) vi->C() = Color4b::Yellow;
if ( (*TDMarkPtr)[(*vi)].Mark == B ) vi->C() = Color4b::White;
if ( (*TDMarkPtr)[(*vi)].Mark == U ) vi->C() = Color4b::Yellow;
if ( (*TDMarkPtr)[(*vi)].Mark == U ) vi->C() = Color4b::Green;
}
int bitflag = FaceType::NewBitFlag();
int bitflag_2 = FaceType::NewBitFlag();
int count;
if (selectForeground) {
for (fi = mesh->face.begin(); fi != mesh->face.end(); ++fi) {
(*fi).ClearUserBit(bitflag);
(*fi).ClearUserBit(bitflag_2);
count = 0;
for (int i = 0; i<3; ++i) {
if ( (*TDMarkPtr)[(*fi).V(i)].Mark == F || (*TDMarkPtr)[(*fi).V(i)].Mark == iF ) ++count;
@ -342,8 +345,11 @@ namespace vcg {
}
tmp_face->ClearUserBit(bitflag);
} else {
edgeFaceQueue.push(tmp_face);
tmp_face->SetUserBit(bitflag);
if (!tmp_face->IsUserBit(bitflag_2)) {
edgeFaceQueue.push(tmp_face);
tmp_face->SetUserBit(bitflag);
tmp_face->SetUserBit(bitflag_2);
}
}
}
}
@ -359,6 +365,9 @@ namespace vcg {
(*fi).ClearS();
}
}
FaceType::DeleteBitFlag(bitflag_2);
FaceType::DeleteBitFlag(bitflag);
}
//debugging function