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 +22 -5
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d7c023eb25 - Show all commits

23
source/blender/geometry/intern/mesh_merge_by_distance.cc
View File

@ -1103,7 +1103,10 @@ static int poly_find_doubles(const OffsetIndices<int> poly_corners_offsets,
/* Fills the `r_buffer` buffer with the intersection of the arrays in `buffer_a` and `buffer_b`. /* Fills the `r_buffer` buffer with the intersection of the arrays in `buffer_a` and `buffer_b`.
* `buffer_a` and `buffer_b` have a sequence of sorted, non-repeating indices representing * `buffer_a` and `buffer_b` have a sequence of sorted, non-repeating indices representing
* polygons. */ * polygons. */
const auto intersect = [](const Span<int> buffer_a, const Span<int> buffer_b, int *r_buffer) { const auto intersect = [](const Span<int> buffer_a,
const Span<int> buffer_b,
const BitVector<> is_double,
int *r_buffer) {
int result_num = 0; int result_num = 0;
int index_a = 0, index_b = 0; int index_a = 0, index_b = 0;
while (index_a < buffer_a.size() && index_b < buffer_b.size()) { while (index_a < buffer_a.size() && index_b < buffer_b.size()) {
@ -1117,7 +1120,12 @@ static int poly_find_doubles(const OffsetIndices<int> poly_corners_offsets,
} }
else { else {
/* Equality. */ /* Equality. */
/* Do not add duplicates.
* As they are already in the original array, this can cause buffer overflow. */
if (!is_double[value_a]) {
r_buffer[result_num++] = value_a; r_buffer[result_num++] = value_a;
}
index_a++; index_a++;
index_b++; index_b++;
} }
@ -1204,6 +1212,7 @@ static int poly_find_doubles(const OffsetIndices<int> poly_corners_offsets,
int *isect_result = doubles_buffer.data() + doubles_buffer_num + 1; int *isect_result = doubles_buffer.data() + doubles_buffer_num + 1;
/* `polys_a` are the polygons connected to the first corner. So skip the first corner. */
for (int corner_index : IndexRange(corner_first + 1, corner_num - 1)) { for (int corner_index : IndexRange(corner_first + 1, corner_num - 1)) {
elem_index = corners[corner_index]; elem_index = corners[corner_index];
link_offs = linked_polys_offset[elem_index]; link_offs = linked_polys_offset[elem_index];
@ -1217,8 +1226,10 @@ static int poly_find_doubles(const OffsetIndices<int> poly_corners_offsets,
polys_b_num--; polys_b_num--;
} while (poly_to_test != poly_index); } while (poly_to_test != poly_index);
doubles_num = intersect( doubles_num = intersect(Span<int>{polys_a, polys_a_num},
Span<int>{polys_a, polys_a_num}, Span<int>{polys_b, polys_b_num}, isect_result); Span<int>{polys_b, polys_b_num},
is_double,
isect_result);
if (doubles_num == 0) { if (doubles_num == 0) {
break; break;
@ -1236,6 +1247,12 @@ static int poly_find_doubles(const OffsetIndices<int> poly_corners_offsets,
} }
doubles_buffer_num += doubles_num; doubles_buffer_num += doubles_num;
doubles_offsets.append(++doubles_buffer_num); doubles_offsets.append(++doubles_buffer_num);
if ((doubles_buffer_num + 1) == poly_num) {
/* The last slot is the remaining unduplicated polygon.
* Avoid checking intersection as there are no more slots left. */
break;
}
} }
} }