diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-02-23 05:51:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-23 05:54:33 +0300 |
| commit | d580c90469b4ba182bd8aa8e7a4e289884e426fe (patch) | |
| tree | 4041254b413aa81d72bb89b4ebfdba8b507bfb22 /source/blender/blenkernel/intern/data_transfer.c | |
| parent | c26fa67bcd051e55960dadbcd5a6ee4fd1d0fb4a (diff) | |
CustomData: const correctness for interp()
Diffstat (limited to 'source/blender/blenkernel/intern/data_transfer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/data_transfer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 5ac7b928d96..8f6d4385b55 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -398,10 +398,11 @@ float data_transfer_interp_float_do( return interpf(val_ret, val_dst, mix_factor); } -static void data_transfer_interp_char(const CustomDataTransferLayerMap *laymap, void *dest, - void **sources, const float *weights, const int count, const float mix_factor) +static void data_transfer_interp_char( + const CustomDataTransferLayerMap *laymap, void *dest, + const void **sources, const float *weights, const int count, const float mix_factor) { - char **data_src = (char **)sources; + const char **data_src = (const char **)sources; char *data_dst = (char *)dest; const int mix_mode = laymap->mix_mode; @@ -425,7 +426,7 @@ static void data_transfer_interp_char(const CustomDataTransferLayerMap *laymap, void data_transfer_layersmapping_add_item( ListBase *r_map, const int cddata_type, const int mix_mode, const float mix_factor, const float *mix_weights, - void *data_src, void *data_dst, const int data_src_n, const int data_dst_n, + 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, cd_datatransfer_interp interp) { |