Bevel: fix crash bug 33362, when beveling one edge at valence 2 vertex.

That special case should have been tested before - the code was wrong
in about three different ways.

diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index f2ea5a5f341805524296e1b5586719c573fd04b1..86509acb1fbfc1a3700191bb31cb3c8d7df8148e 100644 (file)
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -431,10 +431,10 @@ static void offset_in_two_planes(EdgeHalf *e1, EdgeHalf *e2, EdgeHalf *emid,
  * from eh's direction. */
 static void offset_in_plane(EdgeHalf *e, const float plane_no[3], int left, float r[3])
 {
  * from eh's direction. */
 static void offset_in_plane(EdgeHalf *e, const float plane_no[3], int left, float r[3])
 {

-       float dir[3], no[3];
+       float dir[3], no[3], fdir[3];

        BMVert *v;
 
        BMVert *v;
 

-       v = e->is_rev ? e->e->v1 : e->e->v2;
+       v = e->is_rev ? e->e->v2 : e->e->v1;

 
        sub_v3_v3v3(dir, BM_edge_other_vert(e->e, v)->co, v->co);
        normalize_v3(dir);
 
        sub_v3_v3v3(dir, BM_edge_other_vert(e->e, v)->co, v->co);
        normalize_v3(dir);


@@ -449,11 +449,12 @@ static void offset_in_plane(EdgeHalf *e, const float plane_no[3], int left, floa
                        no[1] = 1.0f;
        }
        if (left)
                        no[1] = 1.0f;
        }
        if (left)

-               cross_v3_v3v3(r, no, dir);
+               cross_v3_v3v3(fdir, dir, no);

        else
        else

-               cross_v3_v3v3(r, dir, no);
-       normalize_v3(r);
-       mul_v3_fl(r, e->offset);
+               cross_v3_v3v3(fdir, no, dir);
+       normalize_v3(fdir);
+       copy_v3_v3(r, v->co);
+       madd_v3_v3fl(r, fdir, e->offset);

 }
 
 /* Calculate coordinates of a point a distance d from v on e->e and return it in slideco */
 }
 
 /* Calculate coordinates of a point a distance d from v on e->e and return it in slideco */


@@ -753,6 +754,7 @@ static void build_boundary(MemArena *mem_arena, BevVert *bv)
                slide_dist(e->next, bv->v, e->offset, co);
                v = add_new_bound_vert(mem_arena, vm, co);
                v->efirst = v->elast = e->next;
                slide_dist(e->next, bv->v, e->offset, co);
                v = add_new_bound_vert(mem_arena, vm, co);
                v->efirst = v->elast = e->next;

+               e->next->leftv = e->next->rightv = v;

                vm->mesh_kind = M_POLY;
                return;
        }
                vm->mesh_kind = M_POLY;
                return;
        }


@@ -844,7 +846,6 @@ static void build_boundary(MemArena *mem_arena, BevVert *bv)
        else {
                vm->mesh_kind = M_ADJ;
        }
        else {
                vm->mesh_kind = M_ADJ;
        }

-       /* TODO: if vm->count == 4 and bv->selcount == 4, use M_CROSS pattern */

 }
 
 /*
 }
 
 /*