svn merge ^/trunk/blender -r43294:43338
[blender.git] / source / blender / blenkernel / intern / displist.c
index 17936a44a73c8156d9e8f170c8e02c7325beaefa..5c945c3a17ce43f0b5cadaec31dbe440ce564c10 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) {
        
@@ -884,12 +886,12 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba
 
                        if (dm) {
                                if (vertCos) {
-                                       DerivedMesh *tdm = CDDM_copy(dm);
+                                       DerivedMesh *tdm = CDDM_copy(dm, 0);
                                        dm->release(dm);
                                        dm = tdm;
 
                                        CDDM_apply_vert_coords(dm, vertCos);
-                                       CDDM_calc_normals(dm);
+                                       CDDM_calc_normals_mapping(dm);
                                }
                        } else {
                                if (vertCos) {
@@ -902,7 +904,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) {
@@ -925,12 +927,12 @@ static void curve_calc_modifiers_post(Scene *scene, Object *ob, ListBase *dispba
 
        if (vertCos) {
                if (dm) {
-                       DerivedMesh *tdm = CDDM_copy(dm);
+                       DerivedMesh *tdm = CDDM_copy(dm, 0);
                        dm->release(dm);
                        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);