Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2021-02-22 18:28:00 +0300
committerHans Goudey <h.goudey@me.com>2021-02-22 18:28:00 +0300
commit9ef2679ca9ffcc2aa6bd4eaf2697c185de1f6e1b (patch)
tree3bea332f9eccc66e4659ef57f051a15e10c99605
parentfcac3d04f5507f8fa5440f89be3025f926a2a2fc (diff)
Cleanup: Clang tidy inconsistent parameter name
Use the most recent names for the conflicting parameters.
-rw-r--r--source/blender/blenkernel/intern/customdata.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index ab57676fde3..d8d9675b42b 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -2883,18 +2883,18 @@ void CustomData_copy_elements(int type, void *src_data_ofs, void *dst_data_ofs,
void CustomData_copy_data_layer(const CustomData *source,
CustomData *dest,
- int src_i,
- int dst_i,
+ int src_layer_index,
+ int dst_layer_index,
int src_index,
int dst_index,
int count)
{
const LayerTypeInfo *typeInfo;
- const void *src_data = source->layers[src_i].data;
- void *dst_data = dest->layers[dst_i].data;
+ const void *src_data = source->layers[src_layer_index].data;
+ void *dst_data = dest->layers[dst_layer_index].data;
- typeInfo = layerType_getInfo(source->layers[src_i].type);
+ typeInfo = layerType_getInfo(source->layers[src_layer_index].type);
const size_t src_offset = (size_t)src_index * typeInfo->size;
const size_t dst_offset = (size_t)dst_index * typeInfo->size;
@@ -2903,7 +2903,7 @@ void CustomData_copy_data_layer(const CustomData *source,
if (count && !(src_data == NULL && dst_data == NULL)) {
CLOG_WARN(&LOG,
"null data for %s type (%p --> %p), skipping",
- layerType_getName(source->layers[src_i].type),
+ layerType_getName(source->layers[src_layer_index].type),
(void *)src_data,
(void *)dst_data);
}