svn merge ^/trunk/blender -r46330:46335
[blender.git] / source / blender / blenkernel / intern / DerivedMesh.c
index 34dee93d95ab6ef1beb3c738258647f2c861cf45..c0bf798478c90110db70391d640c7afb343ee756 100644 (file)
@@ -446,10 +446,10 @@ void DM_update_tessface_data(DerivedMesh *dm)
                                not_done--;
                        }
                }
-               mesh_loops_to_mface_corners(fdata, ldata, pdata,
-                                           ml_idx, mf_idx, polyindex[mf_idx],
-                                           mf_len,
-                                           numTex, numCol, hasPCol, hasOrigSpace);
+               BKE_mesh_loops_to_mface_corners(fdata, ldata, pdata,
+                                               ml_idx, mf_idx, polyindex[mf_idx],
+                                               mf_len,
+                                               numTex, numCol, hasPCol, hasOrigSpace);
        }
 
        if (G.debug & G_DEBUG)
@@ -870,7 +870,7 @@ static void *get_orco_coords_dm(Object *ob, BMEditMesh *em, int layer, int *free
                if (em)
                        return (float(*)[3])get_editbmesh_orco_verts(em);
                else
-                       return (float(*)[3])get_mesh_orco_verts(ob);
+                       return (float(*)[3])BKE_mesh_orco_verts_get(ob);
        }
        else if (layer == CD_CLOTH_ORCO) {
                /* apply shape key for cloth, this should really be solved
@@ -932,7 +932,7 @@ static void add_orco_dm(Object *ob, BMEditMesh *em, DerivedMesh *dm,
 
        if (orco) {
                if (layer == CD_ORCO)
-                       transform_mesh_orco_verts(ob->data, orco, totvert, 0);
+                       BKE_mesh_orco_verts_transform(ob->data, orco, totvert, 0);
 
                if (!(layerorco = DM_get_vert_data_layer(dm, layer))) {
                        DM_add_vert_layer(dm, layer, CD_CALLOC, NULL);