blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Cleanup: Clang tidy inconsistent parameter name 

Use the most recent names for the conflicting parameters.
This commit is contained in:
Hans Goudey 2021-02-22 09:28:00 -06:00
parent fcac3d04f5
commit 9ef2679ca9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/customdata.c
View File

@ -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);
}