diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-18 14:17:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-18 14:17:07 +0400 |
| commit | 42ebc9bc8086f2c1fb1323dfe22168419ec83024 (patch) | |
| tree | 14b7c7894ea450fe8c6558d70177705236f459ea /source/blender/bmesh/tools | |
| parent | fd9dac77d1d6de6ae6eea3ccc19099decfae665f (diff) | |
bmesh: move internal API flags out of BMFlagLayer, into BMHeader which was being padded up anyway, added static assert to make sure it stays <=16 bytes.
Diffstat (limited to 'source/blender/bmesh/tools')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 12a85ce34de..cfc7edb2400 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -252,22 +252,19 @@ static BMFace *bev_create_ngon(BMesh *bm, BMVert **vert_arr, int totv, BMFace *f BMFace *f; if (totv == 3) { - f = BM_face_create_quad_tri(bm, - vert_arr[0], vert_arr[1], vert_arr[2], NULL, facerep, 0); + f = BM_face_create_quad_tri_v(bm, vert_arr, 3, facerep, 0); } else if (totv == 4) { - f = BM_face_create_quad_tri(bm, - vert_arr[0], vert_arr[1], vert_arr[2], vert_arr[3], facerep, 0); + f = BM_face_create_quad_tri_v(bm, vert_arr, 4, facerep, 0); } else { int i; - BMEdge *e; BMEdge **ee = NULL; - BLI_array_staticdeclare(ee, 30); + BLI_array_staticdeclare(ee, BM_DEFAULT_NGON_STACK_SIZE); + BLI_array_grow_items(ee, totv); for (i = 0; i < totv; i++) { - e = BM_edge_create(bm, vert_arr[i], vert_arr[(i + 1) % totv], NULL, TRUE); - BLI_array_append(ee, e); + ee[i] = BM_edge_create(bm, vert_arr[i], vert_arr[(i + 1) % totv], NULL, TRUE); } f = BM_face_create_ngon(bm, vert_arr[0], vert_arr[1], ee, totv, FALSE); BLI_array_free(ee); |