blender
/
blender
134
398
Fork 579
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Fix: Knife tool does not interpolate vertex customdata in interior cuts #107367

Merged
Philipp Oeser merged 3 commits from lichtwerk/blender:BM_edgenet_vdata_support_makes_knife_support_vgrous_in_face_cuts into main 2023-04-27 09:24:09 +02:00
Conversation 3 Commits 3 Files Changed 1 +21 -6
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/bmesh/intern/bmesh_polygon_edgenet.c
View File

@ -568,13 +568,16 @@ bool BM_face_split_edgenet(BMesh *bm,
}
}
if (CustomData_has_math(&bm->ldata)) {
const bool has_interp_ldata = CustomData_has_interp(&bm->ldata);
const bool has_interp_vdata = CustomData_has_interp(&bm->vdata);
if (has_interp_ldata || has_interp_vdata) {
/* reuse VERT_VISIT here to tag vert's already interpolated */
BMIter iter;
BMLoop *l_other;
/* See: #BM_loop_interp_from_face for similar logic. */
void **blocks = BLI_array_alloca(blocks, f->len);
void **blocks = has_interp_ldata ? BLI_array_alloca(blocks, f->len) : NULL;
Campbell Barton commented 2023-04-27 02:45:44 +02:00
Outdated
Review
Copy Link

Prefer void **blocks = has_interp_ldata ? BLI_array_alloca(blocks, f->len) : NULL; - uses less space & doesn't leave unassigned.

Prefer `void **blocks = has_interp_ldata ? BLI_array_alloca(blocks, f->len) : NULL;` - uses less space & doesn't leave unassigned.
void **vblocks = has_interp_vdata ? BLI_array_alloca(blocks, f->len) : NULL;
float(*cos_2d)[2] = BLI_array_alloca(cos_2d, f->len);
float *w = BLI_array_alloca(w, f->len);
float axis_mat[3][3];
@ -597,8 +600,12 @@ bool BM_face_split_edgenet(BMesh *bm,
BM_ELEM_API_FLAG_ENABLE(l_iter->v, VERT_VISIT);
mul_v2_m3v3(cos_2d[i], axis_mat, l_iter->v->co);
blocks[i] = l_iter->head.data;
if (has_interp_ldata) {
blocks[i] = l_iter->head.data;
}
if (has_interp_vdata) {
vblocks[i] = l_iter->v->head.data;
}
} while ((void)i++, (l_iter = l_iter->next) != l_first);
for (i = 0; i < edge_net_len; i++) {
@ -616,13 +623,21 @@ bool BM_face_split_edgenet(BMesh *bm,
if (l_first == NULL) {
Hans Goudey commented 2023-04-26 13:51:01 +02:00
Outdated
Review
Copy Link

Looks like this could use liter->v->head.data here instead of requiring the separate vblocks array?

Looks like this could use `liter->v->head.data` here instead of requiring the separate `vblocks` array?
Campbell Barton commented 2023-04-26 13:58:29 +02:00
Outdated
Review
Copy Link

The vblocks array is needed as a source each vertices custom data as they're not contiguous as with Mesh custom-data.

The `vblocks` array is needed as a source each vertices custom data as they're not contiguous as with Mesh custom-data.
Hans Goudey commented 2023-04-26 14:39:44 +02:00
Outdated
Review
Copy Link

Ah of course, my bad, thanks.

Ah of course, my bad, thanks.
mul_v2_m3v3(co, axis_mat, v->co);
interp_weights_poly_v2(w, cos_2d, f->len, co);
CustomData_bmesh_interp(
&bm->ldata, (const void **)blocks, w, NULL, f->len, l_iter->head.data);
if (has_interp_ldata) {
CustomData_bmesh_interp(
&bm->ldata, (const void **)blocks, w, NULL, f->len, l_iter->head.data);
}
if (has_interp_vdata) {
CustomData_bmesh_interp(
&bm->vdata, (const void **)vblocks, w, NULL, f->len, l_iter->v->head.data);
}
l_first = l_iter;
}
else {
CustomData_bmesh_copy_data(
&bm->ldata, &bm->ldata, l_first->head.data, &l_iter->head.data);
CustomData_bmesh_copy_data(
&bm->vdata, &bm->vdata, l_first->v->head.data, &l_iter->v->head.data);
}
}
}