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:
authorCampbell Barton <ideasman42@gmail.com>2021-10-14 02:22:51 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-10-14 06:06:49 +0300
commit5401fda41244175b491ab5aad8c9693b3eb09f33 (patch)
treee21c91d18495431da34ab53779ed3f385bb2348a /source/blender/blenloader
parent576142dc85c78ced792e3440a7665ea57e45a0cc (diff)
Cleanup: avoid using size for array length in naming
Confusing when array allocation takes two kinds of size arguments.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/versioning_300.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index e5b2536f123..b753ab484af 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -153,18 +153,18 @@ static void version_idproperty_move_data_float(IDPropertyUIDataFloat *ui_data,
IDProperty *default_value = IDP_GetPropertyFromGroup(prop_ui_data, "default");
if (default_value != NULL) {
if (default_value->type == IDP_ARRAY) {
- const int size = default_value->len;
- ui_data->default_array_len = size;
+ const int array_len = default_value->len;
+ ui_data->default_array_len = array_len;
if (default_value->subtype == IDP_FLOAT) {
- ui_data->default_array = MEM_malloc_arrayN(size, sizeof(double), __func__);
+ ui_data->default_array = MEM_malloc_arrayN(array_len, sizeof(double), __func__);
const float *old_default_array = IDP_Array(default_value);
for (int i = 0; i < ui_data->default_array_len; i++) {
ui_data->default_array[i] = (double)old_default_array[i];
}
}
else if (default_value->subtype == IDP_DOUBLE) {
- ui_data->default_array = MEM_malloc_arrayN(size, sizeof(double), __func__);
- memcpy(ui_data->default_array, IDP_Array(default_value), sizeof(double) * size);
+ ui_data->default_array = MEM_malloc_arrayN(array_len, sizeof(double), __func__);
+ memcpy(ui_data->default_array, IDP_Array(default_value), sizeof(double) * array_len);
}
}
else if (ELEM(default_value->type, IDP_DOUBLE, IDP_FLOAT)) {