diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-18 09:52:18 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-18 09:52:18 +0400 |
| commit | 6389301eb573625abefc20f93fb83efa64d2600d (patch) | |
| tree | 4cd354a29b4eb29dbae0075499387685bf67c4fb /source/blender/bmesh/tools/BME_bevel.c | |
| parent | df27c315ce8eb72ee7d7d5d8aa3deb1645e88866 (diff) | |
fix for own error in recent scanfill updates, scanfill can hang if run on a polygon with no area.
Diffstat (limited to 'source/blender/bmesh/tools/BME_bevel.c')
| -rw-r--r-- | source/blender/bmesh/tools/BME_bevel.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/bmesh/tools/BME_bevel.c b/source/blender/bmesh/tools/BME_bevel.c index 63976f25eff..59a35abfd63 100644 --- a/source/blender/bmesh/tools/BME_bevel.c +++ b/source/blender/bmesh/tools/BME_bevel.c @@ -148,7 +148,6 @@ float *BME_new_transdata_float(BME_TransData_Head *td) * The drawback, though, is that this code doesn't merge customdata. */ static int BME_Bevel_Dissolve_Disk(BMesh *bm, BMVert *v) { - BMIter iter; BMEdge *e, *elast; BMLoop *l1, *l2; @@ -156,12 +155,6 @@ static int BME_Bevel_Dissolve_Disk(BMesh *bm, BMVert *v) return 0; } - BM_ITER(e, &iter, bm, BM_EDGES_OF_VERT, v) { - if (BM_edge_face_count(e) != 2) { - return 0; - } - } - if (BM_vert_edge_count(v) > 2) { while (BM_vert_edge_count(v) > 2) { e = v->e; @@ -1011,12 +1004,14 @@ static BMesh *BME_bevel_mesh(BMesh *bm, float value, int UNUSED(res), int option } } +#ifdef DEBUG /* Debug print, remov */ BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) { if (f->len == 2) { - printf("warning"); + printf("%s: warning, 2 edge face\n", __func__); } } +#endif return bm; } |