Merge remote-tracking branch 'origin/blender2.8' into temp-dynamic-overridestemp-dynamic-overrides

1 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/blenkernel/BKE_data_transfer.h b/source/blender/blenkernel/BKE_data_transfer.h
index 6559f9a954f..7d0bb67c54d 100644
--- a/source/blender/blenkernel/BKE_data_transfer.h
+++ b/source/blender/blenkernel/BKE_data_transfer.h
@@ -143,9 +143,9 @@ bool BKE_object_data_transfer_mesh(
         const int fromlayers_select[DT_MULTILAYER_INDEX_MAX], const int tolayers_select[DT_MULTILAYER_INDEX_MAX],
         const int mix_mode, const float mix_factor, const char *vgroup_name, const bool invert_vgroup,
         struct ReportList *reports);
-bool BKE_object_data_transfer_dm(
+bool BKE_object_data_transfer_ex(
         struct Depsgraph *depsgraph, struct Scene *scene,
-        struct Object *ob_src, struct Object *ob_dst, struct DerivedMesh *dm_dst,
+        struct Object *ob_src, struct Object *ob_dst, struct Mesh *me_dst,
         const int data_types, bool use_create,
         const int map_vert_mode, const int map_edge_mode, const int map_loop_mode, const int map_poly_mode,
         struct SpaceTransform *space_transform, const bool auto_transform,