diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-18 19:09:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-18 19:09:13 +0400 |
| commit | 40e3ae64787b140384b13797d8f8504861c6ef9f (patch) | |
| tree | 983d779d781d7a393840594edffdd8c2f2bceb19 /source/blender/editors/mesh/editmesh_knife.c | |
| parent | d7542be6ac455f48458f8d3f64bcea41dd22f070 (diff) | |
correct ifdef'd scanfill code, incase someone wants to test.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_knife.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_knife.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index c4af3046cbc..1856ed3b255 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -1680,7 +1680,7 @@ static void remerge_faces(knifetool_opdata *kcd) if (BLI_array_count(faces) > 0) { idx = BM_elem_index_get(faces[0]); - f2 = BM_faces_join(bm, faces, BLI_array_count(faces)); + f2 = BM_faces_join(bm, faces, BLI_array_count(faces), TRUE); if (f2) { BMO_elem_flag_enable(bm, f2, FACE_NEW); BM_elem_index_set(f2, idx); /* set_dirty! *//* BMESH_TODO, check if this is valid or not */ @@ -1700,6 +1700,7 @@ static void remerge_faces(knifetool_opdata *kcd) /* use edgenet to fill faces. this is a bit annoying and convoluted.*/ static void knifenet_fill_faces(knifetool_opdata *kcd) { + ScanFillContext sf_ctx; BMesh *bm = kcd->em->bm; BMIter bmiter; BLI_mempool_iter iter; @@ -1869,15 +1870,15 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) } else { if (lasteve->poly_nr < 2) - BLI_remlink(&fillvertbase, lasteve); + BLI_remlink(&sf_ctx.fillvertbase, lasteve); if (eve->poly_nr < 2) - BLI_remlink(&fillvertbase, eve); + BLI_remlink(&sf_ctx.fillvertbase, eve); } } BLI_edgefill(&sf_ctx, FALSE); - for (efa = fillfacebase.first; efa; efa = efa->next) { + for (efa = sf_ctx.fillfacebase.first; efa; efa = efa->next) { BMVert *v1 = efa->v3->tmp.p, *v2 = efa->v2->tmp.p, *v3 = efa->v1->tmp.p; BMFace *f2; BMLoop *l_iter; @@ -1908,7 +1909,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) } } - BLI_end_edgefill(); + BLI_end_edgefill(&sf_ctx); BLI_smallhash_release(hash); } bm->elem_index_dirty |= BM_FACE; |