blender/blender
161
509
Fork 768
Code Issues 6.7k Pull Requests 912 Projects 18 Wiki Activity

Fix #99887: Multires Unsubdivide freezes Blender with hidden geometry #121086

Merged
Raul Fernandez Hernandez merged 4 commits from farsthary/blender:multires_unsubdivide_freezes into main 2024-05-07 18:05:04 +02:00
Conversation 17 Commits 4 Files Changed 1 +17 -4
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/blenkernel/intern/multires_unsubdivide.cc
View File

@ -841,17 +841,27 @@ static void multires_unsubdivide_get_grid_corners_on_base_mesh(BMFace *f1,
/* Do an edge step until it finds a tagged vertex, which is part of the base mesh. */
/* x axis */
edge_x = edge_step(current_vertex_x, edge_x, &current_vertex_x);
while (!BM_elem_flag_test(current_vertex_x, BM_ELEM_TAG)) {
while (edge_x && !BM_elem_flag_test(current_vertex_x, BM_ELEM_TAG)) {
edge_x = edge_step(current_vertex_x, edge_x, &current_vertex_x);
}
(*r_corner_x) = current_vertex_x;
if (edge_x) {
*r_corner_x = current_vertex_x;
}
else {
*r_corner_x = nullptr;
}
/* Same for y axis */
edge_y = edge_step(current_vertex_y, edge_y, &current_vertex_y);
while (!BM_elem_flag_test(current_vertex_y, BM_ELEM_TAG)) {
while (edge_y && !BM_elem_flag_test(current_vertex_y, BM_ELEM_TAG)) {
edge_y = edge_step(current_vertex_y, edge_y, &current_vertex_y);
}
(*r_corner_y) = current_vertex_y;
if (edge_y) {
*r_corner_y = current_vertex_y;
}
else {
*r_corner_y = nullptr;
}
}
static BMesh *get_bmesh_from_mesh(Mesh *mesh)
@ -1043,6 +1053,9 @@ static void multires_unsubdivide_extract_grids(MultiresUnsubdivideContext *conte
* base mesh of the face of grid that is going to be extracted. */
BMVert *corner_x, *corner_y;
multires_unsubdivide_get_grid_corners_on_base_mesh(l->f, l->e, &corner_x, &corner_y);
if (!corner_x || !corner_y) {
farsthary marked this conversation as resolved Outdated
Hans Goudey commented 2024-04-30 22:09:57 +02:00
Outdated
Review
Copy Link

The style guide mentions always using braces for nested scopes: https://developer.blender.org/docs/handbook/guidelines/c_cpp/#braces

The style guide mentions always using braces for nested scopes: https://developer.blender.org/docs/handbook/guidelines/c_cpp/#braces
Raul Fernandez Hernandez commented 2024-04-30 22:11:46 +02:00
Outdated
Review
Copy Link

wow that's a fast review 😅

wow that's a fast review 😅
continue;
}
/* Map the two obtained vertices to the base mesh. */
const int corner_x_index = orig_to_base_vmap[BM_elem_index_get(corner_x)];