griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #120231: Unwrap can crash with shape_method='CONVEX'

Browse Source 
There was no check for a convex hull with 1-2 points,
causing unwrap to crash on degenerate faces.

Regression caused by [0] (fix for #115061), which hid this bug.

[0]: 0053de6556
This commit is contained in:
Campbell Barton
2024-04-25 17:48:59 +10:00
parent e8229fccba
commit 7337d97e13
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/geometry/intern/uv_pack.cc
View File

@@ -353,14 +353,15 @@ void PackIsland::finalize_geometry_(const UVPackIsland_Params &params, MemArena
/* Compute convex hull. */
int convex_len = BLI_convexhull_2d(source, vert_count, index_map);
/* Write back. */
triangle_vertices_.clear();
Array<float2> convexVertices(convex_len);
for (int i = 0; i < convex_len; i++) {
convexVertices[i] = source[index_map[i]];
if (convex_len >= 3) {
/* Write back. */
triangle_vertices_.clear();
Array<float2> convexVertices(convex_len);
for (int i = 0; i < convex_len; i++) {
convexVertices[i] = source[index_map[i]];
}
add_polygon(convexVertices, arena, heap);
}
add_polygon(convexVertices, arena, heap);
BLI_heap_clear(heap, nullptr);
}