1 files changed, 13 insertions, 15 deletions

diff --git a/source/blender/blenkernel/BKE_mesh_remap.h b/source/blender/blenkernel/BKE_mesh_remap.h
index 5c77ab8a94e..7aea856ff34 100644
--- a/source/blender/blenkernel/BKE_mesh_remap.h
+++ b/source/blender/blenkernel/BKE_mesh_remap.h
@@ -26,7 +26,7 @@
  */
 
 struct CustomData;
-struct DerivedMesh;
+struct Mesh;
 struct MVert;
 struct MemArena;
 
@@ -140,39 +140,37 @@ enum {
 	MREMAP_MODE_TOPOLOGY                 = MREMAP_MODE_VERT | MREMAP_MODE_EDGE | MREMAP_MODE_LOOP | MREMAP_MODE_POLY,
 };
 
-float BKE_mesh_remap_calc_difference_from_dm(
+float BKE_mesh_remap_calc_difference_from_mesh(
         const struct SpaceTransform *space_transform,
-        const struct MVert *verts_dst, const int numverts_dst, struct DerivedMesh *dm_src);
+        const struct MVert *verts_dst, const int numverts_dst, struct Mesh *me_src);
 
-void BKE_mesh_remap_find_best_match_from_dm(
-        const struct MVert *verts_dst, const int numverts_dst, struct DerivedMesh *dm_src,
+void BKE_mesh_remap_find_best_match_from_mesh(
+        const struct MVert *verts_dst, const int numverts_dst, struct Mesh *me_src,
         struct SpaceTransform *r_space_transform);
 
-/* TODO add mesh2mesh versions (we'll need mesh versions of bvhtree funcs too, though!). */
-
-void BKE_mesh_remap_calc_verts_from_dm(
+void BKE_mesh_remap_calc_verts_from_mesh(
         const int mode, const struct SpaceTransform *space_transform, const float max_dist, const float ray_radius,
         const struct MVert *verts_dst, const int numverts_dst, const bool dirty_nors_dst,
-        struct DerivedMesh *dm_src, MeshPairRemap *r_map);
+        struct Mesh *me_src, MeshPairRemap *r_map);
 
-void BKE_mesh_remap_calc_edges_from_dm(
+void BKE_mesh_remap_calc_edges_from_mesh(
         const int mode, const struct SpaceTransform *space_transform, const float max_dist, const float ray_radius,
         const struct MVert *verts_dst, const int numverts_dst, const struct MEdge *edges_dst, const int numedges_dst,
-        const bool dirty_nors_dst, struct DerivedMesh *dm_src, MeshPairRemap *r_map);
+        const bool dirty_nors_dst, struct Mesh *me_src, MeshPairRemap *r_map);
 
-void BKE_mesh_remap_calc_loops_from_dm(
+void BKE_mesh_remap_calc_loops_from_mesh(
         const int mode, const struct SpaceTransform *space_transform, const float max_dist, const float ray_radius,
         struct MVert *verts_dst, const int numverts_dst, struct MEdge *edges_dst, const int numedges_dst,
         struct MLoop *loops_dst, const int numloops_dst, struct MPoly *polys_dst, const int numpolys_dst,
         struct CustomData *ldata_dst, struct CustomData *pdata_dst,
         const bool use_split_nors_dst, const float split_angle_dst, const bool dirty_nors_dst,
-        struct DerivedMesh *dm_src, const bool use_split_nors_src, const float split_angle_src,
+        struct Mesh *me_src,
         MeshRemapIslandsCalc gen_islands_src, const float islands_precision_src, struct MeshPairRemap *r_map);
 
-void BKE_mesh_remap_calc_polys_from_dm(
+void BKE_mesh_remap_calc_polys_from_mesh(
         const int mode, const struct SpaceTransform *space_transform, const float max_dist, const float ray_radius,
         struct MVert *verts_dst, const int numverts_dst, struct MLoop *loops_dst, const int numloops_dst,
         struct MPoly *polys_dst, const int numpolys_dst, struct CustomData *pdata_dst, const bool dirty_nors_dst,
-        struct DerivedMesh *dm_src, struct MeshPairRemap *r_map);
+        struct Mesh *me_src, struct MeshPairRemap *r_map);
 
 #endif  /* __BKE_MESH_REMAP_H__ */