Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +3 -7
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 13ae75f545 - Show all commits

10
source/blender/modifiers/intern/MOD_skin.cc
View File

@ -837,7 +837,7 @@ static EMat *build_edge_mats(const MVertSkin *vs,
static int calc_edge_subdivisions(const float (*vert_positions)[3], static int calc_edge_subdivisions(const float (*vert_positions)[3],
const MVertSkin *nodes, const MVertSkin *nodes,
const MEdge *edge, const MEdge *edge,
const int *degree) const blender::Span<int> degree)
{ {
/* prevent memory errors #38003. */ /* prevent memory errors #38003. */
#define NUM_SUBDIVISIONS_MAX 128 #define NUM_SUBDIVISIONS_MAX 128
@ -905,22 +905,20 @@ static Mesh *subdivide_base(const Mesh *orig)
int orig_edge_num = orig->totedge; int orig_edge_num = orig->totedge;
/* Get degree of all vertices */ /* Get degree of all vertices */
int *degree = MEM_cnew_array<int>(orig_vert_num, __func__); blender::Array<int> degree(orig_vert_num, 0);
for (i = 0; i < orig_edge_num; i++) { for (i = 0; i < orig_edge_num; i++) {
degree[orig_edges[i].v1]++; degree[orig_edges[i].v1]++;
degree[orig_edges[i].v2]++; degree[orig_edges[i].v2]++;
} }
/* Per edge, store how many subdivisions are needed */ /* Per edge, store how many subdivisions are needed */
int *edge_subd = MEM_cnew_array<int>(orig_edge_num, __func__); blender::Array<int> edge_subd(orig_edge_num, 0);
for (i = 0, subd_num = 0; i < orig_edge_num; i++) { for (i = 0, subd_num = 0; i < orig_edge_num; i++) {
edge_subd[i] += calc_edge_subdivisions(orig_vert_positions, orignode, &orig_edges[i], degree); edge_subd[i] += calc_edge_subdivisions(orig_vert_positions, orignode, &orig_edges[i], degree);
BLI_assert(edge_subd[i] >= 0); BLI_assert(edge_subd[i] >= 0);
subd_num += edge_subd[i]; subd_num += edge_subd[i];
} }
MEM_freeN(degree);
/* Allocate output mesh */ /* Allocate output mesh */
Mesh *result = BKE_mesh_new_nomain_from_template( Mesh *result = BKE_mesh_new_nomain_from_template(
orig, orig_vert_num + subd_num, orig_edge_num + subd_num, 0, 0); orig, orig_vert_num + subd_num, orig_edge_num + subd_num, 0, 0);
@ -1024,8 +1022,6 @@ static Mesh *subdivide_base(const Mesh *orig)
result_edge_i++; result_edge_i++;
} }
MEM_freeN(edge_subd);
return result; return result;
} }