From fffff5a9931931a5706fcd6de7743b3021bc09c2 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 21 Jun 2018 14:39:28 +0200 Subject: Cleanup: nuke DM out of data transfer code. This was actually rather hairy, this code is huge and complicated, easy to make mistakes... Good thing is, it will allow for significant simplification and more (name) cleanup in following commits ;) --- source/blender/blenkernel/BKE_data_transfer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenkernel/BKE_data_transfer.h') diff --git a/source/blender/blenkernel/BKE_data_transfer.h b/source/blender/blenkernel/BKE_data_transfer.h index 6559f9a954f..3186e4ffe06 100644 --- a/source/blender/blenkernel/BKE_data_transfer.h +++ b/source/blender/blenkernel/BKE_data_transfer.h @@ -145,7 +145,7 @@ bool BKE_object_data_transfer_mesh( struct ReportList *reports); bool BKE_object_data_transfer_dm( 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 *dm_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, -- cgit v1.2.3