main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Showing only changes of commit 4d5a3c9932 - Show all commits

View File

@ -1115,7 +1115,7 @@ static int poly_find_doubles(const OffsetIndices<int> poly_corners_offsets,
* polygons. */ * polygons. */
const auto intersect = [](const Span<int> buffer_a, const auto intersect = [](const Span<int> buffer_a,
const Span<int> buffer_b, const Span<int> buffer_b,
const BitVector<> is_double, const BitVector<> &is_double,
int *r_buffer) { 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;