mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: slice crash with height_range 

github: 3917
Change-Id: Icdf83013213b47935b7a795ed75cc3d49057665d
This commit is contained in:
zhimin.zeng 2024-04-23 17:21:08 +08:00 committed by Lane.Wei
parent 43b1113b88
commit 11d54be379
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/PrintObjectSlice.cpp
View File

@ -215,7 +215,9 @@ static inline bool overlap_in_xy(const PrintObjectRegions::BoundingBox &l, const
static std::vector<PrintObjectRegions::LayerRangeRegions>::const_iterator layer_range_first(const std::vector<PrintObjectRegions::LayerRangeRegions> &layer_ranges, double z) static std::vector<PrintObjectRegions::LayerRangeRegions>::const_iterator layer_range_first(const std::vector<PrintObjectRegions::LayerRangeRegions> &layer_ranges, double z)
{ {
auto it = lower_bound_by_predicate(layer_ranges.begin(), layer_ranges.end(), auto it = lower_bound_by_predicate(layer_ranges.begin(), layer_ranges.end(),
[z](const PrintObjectRegions::LayerRangeRegions &lr) { return lr.layer_height_range.second < z; }); [z](const PrintObjectRegions::LayerRangeRegions &lr) {
return lr.layer_height_range.second < z && abs(lr.layer_height_range.second - z) > EPSILON;
});
assert(it != layer_ranges.end() && it->layer_height_range.first <= z && z <= it->layer_height_range.second); assert(it != layer_ranges.end() && it->layer_height_range.first <= z && z <= it->layer_height_range.second);
if (z == it->layer_height_range.second) if (z == it->layer_height_range.second)
if (auto it_next = it; ++ it_next != layer_ranges.end() && it_next->layer_height_range.first == z) if (auto it_next = it; ++ it_next != layer_ranges.end() && it_next->layer_height_range.first == z)
@ -229,7 +231,7 @@ static std::vector<PrintObjectRegions::LayerRangeRegions>::const_iterator layer_
std::vector<PrintObjectRegions::LayerRangeRegions>::const_iterator it, std::vector<PrintObjectRegions::LayerRangeRegions>::const_iterator it,
double z) double z)
{ {
for (; it->layer_height_range.second <= z; ++ it) for (; it->layer_height_range.second <= z + EPSILON; ++ it)
assert(it != layer_ranges.end()); assert(it != layer_ranges.end());
assert(it != layer_ranges.end() && it->layer_height_range.first <= z && z < it->layer_height_range.second); assert(it != layer_ranges.end() && it->layer_height_range.first <= z && z < it->layer_height_range.second);
return it; return it;