svn merge ^/trunk/blender -r46300:46330
[blender.git] / source / blender / blenkernel / intern / displist.c
index 1411c910894eceac9fdebc2c4c3c7e9464935d27..7bd95dfa7dd38f2d7e58bf5a734543c6cc6b28e2 100644 (file)
@@ -432,7 +432,7 @@ void filldisplist(ListBase *dispbase, ListBase *to, int flipnormal)
                totvert= 0;
                nextcol= 0;
                
-               BLI_begin_edgefill(&sf_ctx);
+               BLI_scanfill_begin(&sf_ctx);
                
                dl= dispbase->first;
                while (dl) {
@@ -449,18 +449,18 @@ void filldisplist(ListBase *dispbase, ListBase *to, int flipnormal)
                                                while (a--) {
                                                        vlast= eve;
 
-                                                       eve = BLI_addfillvert(&sf_ctx, f1);
+                                                       eve = BLI_scanfill_vert_add(&sf_ctx, f1);
                                                        totvert++;
 
                                                        if (vlast==NULL) v1= eve;
                                                        else {
-                                                               BLI_addfilledge(&sf_ctx, vlast, eve);
+                                                               BLI_scanfill_edge_add(&sf_ctx, vlast, eve);
                                                        }
                                                        f1+=3;
                                                }
 
                                                if (eve!=NULL && v1!=NULL) {
-                                                       BLI_addfilledge(&sf_ctx, eve, v1);
+                                                       BLI_scanfill_edge_add(&sf_ctx, eve, v1);
                                                }
                                        }
                                        else if (colnr<dl->col) {
@@ -473,7 +473,7 @@ void filldisplist(ListBase *dispbase, ListBase *to, int flipnormal)
                        dl= dl->next;
                }
                
-               if (totvert && (tot= BLI_edgefill(&sf_ctx, FALSE))) { // XXX (obedit && obedit->actcol)?(obedit->actcol-1):0)) {
+               if (totvert && (tot= BLI_scanfill_calc(&sf_ctx, FALSE))) { // XXX (obedit && obedit->actcol)?(obedit->actcol-1):0)) {
                        if (tot) {
                                dlnew= MEM_callocN(sizeof(DispList), "filldisplist");
                                dlnew->type= DL_INDEX3;
@@ -518,7 +518,7 @@ void filldisplist(ListBase *dispbase, ListBase *to, int flipnormal)
                        BLI_addhead(to, dlnew);
                        
                }
-               BLI_end_edgefill(&sf_ctx);
+               BLI_scanfill_end(&sf_ctx);
 
                if (nextcol) {
                        /* stay at current char but fill polys with next material */
@@ -1269,7 +1269,7 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
                if (cu->path) free_path(cu->path);
                cu->path= NULL;
 
-               if (ob->type==OB_FONT) BKE_text_to_curve(G.main, scene, ob, 0);
+               if (ob->type==OB_FONT) BKE_vfont_to_curve(G.main, scene, ob, 0);
 
                if (!forOrco) curve_calc_modifiers_pre(scene, ob, forRender, &originalVerts, &deformedVerts, &numVerts);
 
@@ -1528,7 +1528,7 @@ static void boundbox_displist(Object *ob)
        }
        
        if (bb) {
-               boundbox_set_from_min_max(bb, min, max);
+               BKE_boundbox_init_from_minmax(bb, min, max);
        }
 }