compiler fix part 1
[[Split portion of a mixed commit.]]
This commit is contained in:
@@ -115,7 +115,7 @@ int BM_Verts_In_Face(BMesh *bm, BMFace *f, BMVert **varr, int len)
|
||||
do{
|
||||
if(BMO_TestFlag(bm, curloop->v, BM_OVERLAP)) count++;
|
||||
curloop = ((BMLoop*)(curloop->head.next));
|
||||
} while(curloop = ((BMLoop*)(curloop->head.next)));
|
||||
} while(curloop != f->loopbase);
|
||||
|
||||
for(i=0; i < len; i++) BMO_ClearFlag(bm, varr[i], BM_OVERLAP);
|
||||
|
||||
|
||||
@@ -208,7 +208,6 @@ static void *BMW_walk(BMWalker *walker)
|
||||
while(walker->currentstate){
|
||||
current = walker->step(walker);
|
||||
if(current) return current;
|
||||
else BMW_popstate(walker);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -97,11 +97,19 @@ void dissolvefaces_exec(BMesh *bm, BMOperator *op)
|
||||
|
||||
f= BM_Make_Ngon(bm, edges[0]->v1, edges[0]->v2, edges, j, 0);
|
||||
|
||||
if (!f) continue;
|
||||
|
||||
/*
|
||||
NOTE: sadly, make ngon's overlap checking option
|
||||
crashes ;/
|
||||
make ngon can fail, if there was already an existing face.
|
||||
this is desired behaviour, I think, so we'll just silently
|
||||
ignore any possible other error cases.
|
||||
if (!f) {
|
||||
/*raise error*/
|
||||
//raise error
|
||||
BMO_RaiseError(bm, op, BMERR_DISSOLVEFACES_FAILED, NULL);
|
||||
goto cleanup;
|
||||
}
|
||||
}*/
|
||||
|
||||
BMO_SetFlag(bm, f, FACE_NEW);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user