1 files changed, 32 insertions, 23 deletions

diff --git a/source/blender/blenkernel/intern/data_transfer_intern.h b/source/blender/blenkernel/intern/data_transfer_intern.h
index c5d7dd42cb8..b5b3db31fbf 100644
--- a/source/blender/blenkernel/intern/data_transfer_intern.h
+++ b/source/blender/blenkernel/intern/data_transfer_intern.h
@@ -25,52 +25,61 @@
 
 #include "BKE_customdata.h" /* For cd_datatransfer_interp */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct CustomData;
 struct CustomDataTransferLayerMap;
 struct ListBase;
 
-float data_transfer_interp_float_do(const int mix_mode,
-                                    const float val_dst,
-                                    const float val_src,
-                                    const float mix_factor);
+float data_transfer_interp_float_do(int mix_mode, float val_dst, float val_src, float mix_factor);
 
 void data_transfer_layersmapping_add_item(struct ListBase *r_map,
-                                          const int data_type,
-                                          const int mix_mode,
-                                          const float mix_factor,
+                                          int data_type,
+                                          int mix_mode,
+                                          float mix_factor,
                                           const float *mix_weights,
                                           const void *data_src,
                                           void *data_dst,
-                                          const int data_src_n,
-                                          const int data_dst_n,
-                                          const size_t elem_size,
-                                          const size_t data_size,
-                                          const size_t data_offset,
-                                          const uint64_t data_flag,
+                                          int data_src_n,
+                                          int data_dst_n,
+                                          size_t elem_size,
+                                          size_t data_size,
+                                          size_t data_offset,
+                                          uint64_t data_flag,
                                           cd_datatransfer_interp interp,
                                           void *interp_data);
 
 /* Type-specific. */
 
 bool data_transfer_layersmapping_vgroups(struct ListBase *r_map,
-                                         const int mix_mode,
-                                         const float mix_factor,
+                                         int mix_mode,
+                                         float mix_factor,
                                          const float *mix_weights,
-                                         const int num_elem_dst,
-                                         const bool use_create,
-                                         const bool use_delete,
+                                         int num_elem_dst,
+                                         bool use_create,
+                                         bool use_delete,
                                          struct Object *ob_src,
                                          struct Object *ob_dst,
                                          struct CustomData *cd_src,
                                          struct CustomData *cd_dst,
-                                         const bool use_dupref_dst,
-                                         const int fromlayers,
-                                         const int tolayers);
+                                         bool use_dupref_dst,
+                                         int fromlayers,
+                                         int tolayers);
 
 /* Defined in customdata.c */
+
+/**
+ * Normals are special, we need to take care of source & destination spaces.
+ */
 void customdata_data_transfer_interp_normal_normals(const CustomDataTransferLayerMap *laymap,
                                                     void *data_dst,
                                                     const void **sources,
                                                     const float *weights,
-                                                    const int count,
-                                                    const float mix_factor);
+                                                    int count,
+                                                    float mix_factor);
+
+#ifdef __cplusplus
+}
+#endif