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/modifiers/intern/MOD_solidify_nonmanifold.c
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/modifiers/intern/MOD_solidify_nonmanifold.c')
-rw-r--r--source/blender/modifiers/intern/MOD_solidify_nonmanifold.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
index f654b69841e..d4aaefcfe05 100644
--- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
+++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
@@ -1168,9 +1168,9 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
add_index++;
}
if (last_split > split) {
- const uint size = (split + edges_len) - (uint)last_split;
+ const uint edges_len_group = (split + edges_len) - (uint)last_split;
NewEdgeRef **edges = MEM_malloc_arrayN(
- size, sizeof(*edges), "edge_group split in solidify");
+ edges_len_group, sizeof(*edges), "edge_group split in solidify");
memcpy(edges,
g.edges + last_split,
(edges_len - (uint)last_split) * sizeof(*edges));
@@ -1180,7 +1180,7 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
edge_groups[j + add_index] = (EdgeGroup){
.valid = true,
.edges = edges,
- .edges_len = size,
+ .edges_len = edges_len_group,
.open_face_edge = MOD_SOLIDIFY_EMPTY_TAG,
.is_orig_closed = g.is_orig_closed,
.is_even_split = is_even_split,
@@ -1193,14 +1193,14 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
};
}
else {
- const uint size = split - (uint)last_split;
+ const uint edges_len_group = split - (uint)last_split;
NewEdgeRef **edges = MEM_malloc_arrayN(
- size, sizeof(*edges), "edge_group split in solidify");
- memcpy(edges, g.edges + last_split, size * sizeof(*edges));
+ edges_len_group, sizeof(*edges), "edge_group split in solidify");
+ memcpy(edges, g.edges + last_split, edges_len_group * sizeof(*edges));
edge_groups[j + add_index] = (EdgeGroup){
.valid = true,
.edges = edges,
- .edges_len = size,
+ .edges_len = edges_len_group,
.open_face_edge = MOD_SOLIDIFY_EMPTY_TAG,
.is_orig_closed = g.is_orig_closed,
.is_even_split = is_even_split,