diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-08-14 10:46:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-14 10:46:26 +0300 |
| commit | 8b286bf35a379bca8412cc1d82e8eb85b0bc6316 (patch) | |
| tree | 813f3f46fc0c36ae42e4cca1b79820a2d518bba3 /source/blender/bmesh | |
| parent | fdfd87f2f4e656b2292683c923156dd9ea96512b (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index a7f8854a966..9cef3852d01 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -3135,43 +3135,50 @@ static void bevel_build_rings(BevelParams *bp, BMesh *bm, BevVert *bv) BLI_assert(bmv1 && bmv2 && bmv3 && bmv4); if (bp->vertex_only) { if (j < k) { - if (k == ns2 && j == ns2 - 1) + if (k == ns2 && j == ns2 - 1) { bev_create_quad_ex(bm, bmv1, bmv2, bmv3, bmv4, f2, f2, f2, f2, - NULL, NULL, v->next->efirst->e, bme, mat_nr); - else + NULL, NULL, v->next->efirst->e, bme, mat_nr); + } + else { bev_create_quad(bm, bmv1, bmv2, bmv3, bmv4, f2, f2, f2, f2, mat_nr); + } } else if (j > k) { bev_create_quad(bm, bmv1, bmv2, bmv3, bmv4, f2, f2, f2, f2, mat_nr); } else { /* j == k */ /* only one edge attached to v, since vertex_only */ - if (e->is_seam) + if (e->is_seam) { bev_create_quad_ex(bm, bmv1, bmv2, bmv3, bmv4, f2, f2, f2, f2, - bme, NULL, bme, NULL, mat_nr); - else + bme, NULL, bme, NULL, mat_nr); + } + else { bev_create_quad_ex(bm, bmv1, bmv2, bmv3, bmv4, f2, f2, f2, f, - bme, NULL, bme, NULL, mat_nr); + bme, NULL, bme, NULL, mat_nr); + } } } else { /* edge bevel */ if (odd) { if (k == ns2) { - if (e->is_seam) + if (e->is_seam) { bev_create_quad_ex(bm, bmv1, bmv2, bmv3, bmv4, f, f, f, f, - NULL, bme, bme, NULL, mat_nr); - else + NULL, bme, bme, NULL, mat_nr); + } + else { bev_create_quad(bm, bmv1, bmv2, bmv3, bmv4, f, f2, f2, f, mat_nr); + } } - else + else { bev_create_quad(bm, bmv1, bmv2, bmv3, bmv4, f, f, f, f, mat_nr); + } } else { bme1 = k == ns2 - 1 ? bme : NULL; bme3 = j == ns2 - 1 ? v->prev->ebev->e : NULL; bme2 = bme1 != NULL ? bme1 : bme3; bev_create_quad_ex(bm, bmv1, bmv2, bmv3, bmv4, f, f, f, f, - NULL, bme1, bme2, bme3, mat_nr); + NULL, bme1, bme2, bme3, mat_nr); } } } |