archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for eternal loop in scanfill,

Browse Source 
The cause for this is bmesh faces which have zero area have their normals set to a fake value (Z-Up), this would break scanfill, possible fixes are to calculate the faces normal each time or tag as invalid but its easiest to avoid the eternal loop with an extra test.
This commit is contained in:
Campbell Barton
2012-04-18 14:06:59 +00:00
parent 580f19d949
commit ca913254aa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenlib/intern/scanfill.c
View File

@@ -581,12 +581,12 @@ static int scanfill(ScanFillContext *sf_ctx, PolyFill *pf)
* fix to #4544. */
if (eed->v1->f == 255) {
v1 = eed->v1;
while ((eed->v1->f == 255) && (eed->v1->tmp.v != v1))
while ((eed->v1->f == 255) && (eed->v1->tmp.v != v1) && (eed->v1 != eed->v1->tmp.v))
eed->v1 = eed->v1->tmp.v;
}
if (eed->v2->f == 255) {
v2 = eed->v2;
while ((eed->v2->f == 255) && (eed->v2->tmp.v != v2))
while ((eed->v2->f == 255) && (eed->v2->tmp.v != v2) && (eed->v2 != eed->v2->tmp.v))
eed->v2 = eed->v2->tmp.v;
}
if (eed->v1 != eed->v2) addedgetoscanlist(sf_ctx, eed, verts);
@@ -876,8 +876,8 @@ int BLI_edgefill_ex(ScanFillContext *sf_ctx, const short do_quad_tri_speedup, co
for (eve = sf_ctx->fillvertbase.first; eve; eve = eve->next) {
if (LIKELY(!compare_v3v3(v_prev, eve->co, COMPLIMIT))) {
add_newell_cross_v3_v3v3(n, v_prev, eve->co);
v_prev = eve->co;
}
v_prev = eve->co;
}
}