blender
/
blender
136
411
Fork 595
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

BLI: refactor IndexMask for better performance and memory usage #104629

Merged
Jacques Lucke merged 254 commits from JacquesLucke/blender:index-mask-refactor into main 2023-05-24 18:11:47 +02:00
Conversation 6 Commits 254 Files Changed 182 +3 -1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b343191503 - Show all commits

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

@ -193,8 +193,9 @@ static void consolidate_segments(Vector<IndexMaskSegment> &segments, IndexMaskMe
const IndexMaskSegment segment = segments[segment_i];
const std::optional<IndexRange> segment_base_range =
unique_sorted_indices::non_empty_as_range_try(segment.base_span());
const bool segment_is_range = segment_base_range.has_value();
if (group_as_range && segment_base_range.has_value()) {
if (group_as_range && segment_is_range) {
if (group_last + 1 == segment[0]) {
if (segment.last() - group_first + 1 < max_segment_size) {
/* Can combine previous and current range. */
@ -208,6 +209,7 @@ static void consolidate_segments(Vector<IndexMaskSegment> &segments, IndexMaskMe
group_start_segment_i = segment_i;
group_first = segment[0];
group_last = segment.last();
group_as_range = segment_is_range;
}
finish_group(segments.size() - 1);