From 25e579c63191af5cd00d35da5af122f0d7fbd723 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 13 Mar 2013 14:54:47 +0000 Subject: fix for minor glitch in recent addition to create faces from partial selections. BM_edge_exists() would return an edge if both verts passed match, now assert instead. --- source/blender/bmesh/intern/bmesh_polygon.c | 4 ++-- source/blender/bmesh/intern/bmesh_queries.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/bmesh') diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index c77e1603885..e2d2fa67f31 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -157,8 +157,8 @@ static void bm_face_calc_poly_normal_vertex_cos(BMFace *f, float n[3], /** * For tools that insist on using triangles, ideally we would cache this data. * - * \param r_loops Empty array of loops, (f->len) - * \param r_index Empty array of loops, ((f->len - 2) * 3) + * \param r_loops Store face loop pointers, (f->len) + * \param r_index Store triangle triples, indicies into \a r_loops, ((f->len - 2) * 3) */ void BM_face_calc_tessellation(BMFace *f, BMLoop **r_loops, int (*_r_index)[3]) { diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c index 54950f2af82..c073f0f2793 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_queries.c @@ -1352,6 +1352,8 @@ BMEdge *BM_edge_exists(BMVert *v1, BMVert *v2) BMIter iter; BMEdge *e; + BLI_assert(v1 != v2); + BM_ITER_ELEM (e, &iter, v1, BM_EDGES_OF_VERT) { if (e->v1 == v2 || e->v2 == v2) return e; -- cgit v1.2.3