diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-08-21 09:11:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-21 09:11:11 +0400 |
| commit | 57f8a252d6827861a1678960928a2752b72570d5 (patch) | |
| tree | 2ad20f058d67b8690440904e2e9564f373315df7 /source/blender/modifiers/intern/MOD_skin.c | |
| parent | f6b13c83ab3e5f3ca7411747ca67a5468f6392ca (diff) | |
fix own regression [#36443] Vertex to UV index doesn't match with 2.68a
add BM_face_create_verts wrapper for BM_face_create which creates its own edge array.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_skin.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_skin.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index 83ac9f34df3..51d8547528c 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -933,7 +933,6 @@ static void add_poly(SkinOutput *so, BMVert *v4) { BMVert *verts[4] = {v1, v2, v3, v4}; - BMEdge *edges[4]; BMFace *f; BLI_assert(v1 != v2 && v1 != v3 && v1 != v4); @@ -941,18 +940,7 @@ static void add_poly(SkinOutput *so, BLI_assert(v3 != v4); BLI_assert(v1 && v2 && v3); - edges[0] = BM_edge_create(so->bm, v1, v2, NULL, BM_CREATE_NO_DOUBLE); - edges[1] = BM_edge_create(so->bm, v2, v3, NULL, BM_CREATE_NO_DOUBLE); - if (v4) { - edges[2] = BM_edge_create(so->bm, v3, v4, NULL, BM_CREATE_NO_DOUBLE); - edges[3] = BM_edge_create(so->bm, v4, v1, NULL, BM_CREATE_NO_DOUBLE); - } - else { - edges[2] = BM_edge_create(so->bm, v3, v1, NULL, BM_CREATE_NO_DOUBLE); - edges[3] = NULL; - } - - f = BM_face_create(so->bm, verts, edges, v4 ? 4 : 3, BM_CREATE_NO_DOUBLE); + f = BM_face_create_verts(so->bm, verts, v4 ? 4 : 3, BM_CREATE_NO_DOUBLE, true); if (so->smd->flag & MOD_SKIN_SMOOTH_SHADING) BM_elem_flag_enable(f, BM_ELEM_SMOOTH); f->mat_nr = so->mat_nr; |