blender/blender
150
480
Fork 710
Code Issues 6.8k Pull Requests 904 Projects 18 Wiki Activity

BLI: IndexMask: Comparison operators #117814

Merged
Jacques Lucke merged 26 commits from mod_moder/blender:index_mask_cmp into main 2024-02-10 15:32:44 +01:00
Conversation 1 Commits 26 Files Changed 3 +7 -5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4b0ee0b1a0 - Show all commits

12
source/blender/blenlib/intern/index_mask.cc
View File

@ -773,11 +773,14 @@ static void foreach_sequence(std::array<IndexMask, Count> masks, Func &&func)
MutableSpan(start_iter).fill(0);
std::array<IndexMaskSegment, Count> segments;
for (const int64_t mask_i : IndexRange(Count)) {
segments[mask_i] = masks[mask_i].segment(0);
}
while (segment_iter[0] != masks[0].segments_num()) {
for (const int64_t mask_i : IndexRange(Count)) {
if (start_iter[mask_i] == 0) {
segments[mask_i] = masks[mask_i].segment(0);
}
}
int16_t min_sequence_size = std::numeric_limits<int16_t>::max();
for (const int64_t mask_i : IndexRange(Count)) {
min_sequence_size = math::min(min_sequence_size,
@ -795,9 +798,8 @@ static void foreach_sequence(std::array<IndexMask, Count> masks, Func &&func)
for (const int64_t mask_i : IndexRange(Count)) {
if (segments[mask_i].size() - start_iter[mask_i] == min_sequence_size) {
start_iter[mask_i] = 0;
segment_iter[mask_i]++;
segments[mask_i] = masks[mask_i].segment(segment_iter[mask_i]);
start_iter[mask_i] = 0;
}
else {
start_iter[mask_i] += min_sequence_size;