svn merge ^/trunk/blender -r43830:43864
[blender.git] / source / blender / blenkernel / intern / displist.c
index b14b9b43cf37d1508b3f6507b802a81609ff7e60..5661ab63f1a3d1f6412b9fee5c86c1ff64ed8a0a 100644 (file)
@@ -432,6 +432,8 @@ void filldisplist(ListBase *dispbase, ListBase *to, int flipnormal)
                totvert= 0;
                nextcol= 0;
                
+               BLI_begin_edgefill();
+               
                dl= dispbase->first;
                while(dl) {
        
@@ -890,7 +892,7 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba
                                        dm = tdm;
 
                                        CDDM_apply_vert_coords(dm, vertCos);
-                                       CDDM_calc_normals(dm);
+                                       CDDM_calc_normals_mapping(dm);
                                }
                        } else {
                                if (vertCos) {
@@ -903,7 +905,7 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba
 
                                dm= CDDM_from_curve_customDB(ob, dispbase);
 
-                               CDDM_calc_normals(dm);
+                               CDDM_calc_normals_mapping(dm);
                        }
 
                        if (vertCos) {
@@ -931,7 +933,7 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba
                        dm = tdm;
 
                        CDDM_apply_vert_coords(dm, vertCos);
-                       CDDM_calc_normals(dm);
+                       CDDM_calc_normals_mapping(dm);
                        MEM_freeN(vertCos);
                } else {
                        displist_apply_allverts(dispbase, vertCos);