svn merge ^/trunk/blender -r46300:46330
[blender.git] / source / blender / blenkernel / intern / editderivedmesh.c
index 5e3f886c7623a439cda6e2c9b92a0596dd40dbae..34794bd5b1f90bd0efac549088b50e1490e75b31 100644 (file)
@@ -197,18 +197,18 @@ static void BMEdit_RecalcTessellation_intern(BMEditMesh *tm)
                        ScanFillFace *efa;
                        int totfilltri;
 
-                       BLI_begin_edgefill(&sf_ctx);
+                       BLI_scanfill_begin(&sf_ctx);
                        /*scanfill time*/
                        l = BM_iter_new(&liter, bm, BM_LOOPS_OF_FACE, f);
                        for (j=0; l; l=BM_iter_step(&liter), j++) {
                                /*mark order*/
                                BM_elem_index_set(l, j); /* set_loop */
 
-                               v = BLI_addfillvert(&sf_ctx, l->v->co);
+                               v = BLI_scanfill_vert_add(&sf_ctx, l->v->co);
                                v->tmp.p = l;
 
                                if (lastv) {
-                                       /* e = */ BLI_addfilledge(&sf_ctx, lastv, v);
+                                       /* e = */ BLI_scanfill_edge_add(&sf_ctx, lastv, v);
                                }
 
                                lastv = v;
@@ -216,9 +216,9 @@ static void BMEdit_RecalcTessellation_intern(BMEditMesh *tm)
                        }
 
                        /*complete the loop*/
-                       BLI_addfilledge(&sf_ctx, firstv, v);
+                       BLI_scanfill_edge_add(&sf_ctx, firstv, v);
 
-                       totfilltri = BLI_edgefill_ex(&sf_ctx, FALSE, f->no);
+                       totfilltri = BLI_scanfill_calc_ex(&sf_ctx, FALSE, f->no);
                        BLI_array_grow_items(looptris, totfilltri);
 
                        for (efa = sf_ctx.fillfacebase.first; efa; efa=efa->next) {
@@ -236,7 +236,7 @@ static void BMEdit_RecalcTessellation_intern(BMEditMesh *tm)
                                i += 1;
                        }
 
-                       BLI_end_edgefill(&sf_ctx);
+                       BLI_scanfill_end(&sf_ctx);
                }
        }