diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-02-23 07:55:48 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-23 08:17:16 +0300 |
commit | 7c03ef295b6f6959b23a27f51358cc3797120bb3 (patch) | |
tree | ba37e17815dcabc7f2bfeccc99520c2f9d86d5f2 /source/blender/blenkernel/intern/customdata.c | |
parent | 0c4fb47eddab9187c797a97bd8f2216a4be92156 (diff) |
CustomData: const correctness
Diffstat (limited to 'source/blender/blenkernel/intern/customdata.c')
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 1362c55f49c..483a4b979b9 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -2408,7 +2408,7 @@ void *CustomData_set_layer_n(const struct CustomData *data, int type, int n, voi return ptr; } -void CustomData_set(const CustomData *data, int index, int type, void *source) +void CustomData_set(const CustomData *data, int index, int type, const void *source) { void *dest = CustomData_get(data, index, type); const LayerTypeInfo *typeInfo = layerType_getInfo(type); @@ -2573,8 +2573,9 @@ void CustomData_bmesh_init_pool(CustomData *data, int totelem, const char htype) } } -bool CustomData_bmesh_merge(CustomData *source, CustomData *dest, - CustomDataMask mask, int alloctype, BMesh *bm, const char htype) +bool CustomData_bmesh_merge( + const CustomData *source, CustomData *dest, + CustomDataMask mask, int alloctype, BMesh *bm, const char htype) { BMHeader *h; BMIter iter; @@ -2944,7 +2945,7 @@ void CustomData_data_add(int type, void *data1, const void *data2) typeInfo->add(data1, data2); } -void CustomData_bmesh_set(const CustomData *data, void *block, int type, void *source) +void CustomData_bmesh_set(const CustomData *data, void *block, int type, const void *source) { void *dest = CustomData_bmesh_get(data, block, type); const LayerTypeInfo *typeInfo = layerType_getInfo(type); @@ -2957,7 +2958,7 @@ void CustomData_bmesh_set(const CustomData *data, void *block, int type, void *s memcpy(dest, source, typeInfo->size); } -void CustomData_bmesh_set_n(CustomData *data, void *block, int type, int n, void *source) +void CustomData_bmesh_set_n(CustomData *data, void *block, int type, int n, const void *source) { void *dest = CustomData_bmesh_get_n(data, block, type, n); const LayerTypeInfo *typeInfo = layerType_getInfo(type); @@ -2970,7 +2971,7 @@ void CustomData_bmesh_set_n(CustomData *data, void *block, int type, int n, void memcpy(dest, source, typeInfo->size); } -void CustomData_bmesh_set_layer_n(CustomData *data, void *block, int n, void *source) +void CustomData_bmesh_set_layer_n(CustomData *data, void *block, int n, const void *source) { void *dest = CustomData_bmesh_get_layer_n(data, block, n); const LayerTypeInfo *typeInfo = layerType_getInfo(data->layers[n].type); |