mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-27 10:51:22 +00:00
Merge Main into Belt Printer
Merge origin/main (00429da739) into belt-printer.
Conflicts resolved:
- src/CMakeLists.txt: keep both wxInspector workarounds.
- GCodeProcessor.cpp: keep the belt compare_pos / z_for_height lines.
- PrintObjectSlice.cpp: the belt bbox-Z guard also covers main's
printable_region_ids bookkeeping.
- TreeSupport.cpp: the belt-floor check runs before main's PendingNode
queueing.
- Tab.hpp: keep the belt fields, drop the removed upload description
fields.
- tests/libslic3r/CMakeLists.txt: keep both test files.
Also included:
- eSUN PLA belt presets declare their own filament_id (OFkrxQC4) and
scripts/filament_id_snapshot.json is regenerated, as main's filament_id
check requires.
- Custom.json version bumped to 02.04.00.05 so the belt entries reach
existing installs.
- Fix the ambiguous WithinRel call in the belt apron width test, which
otherwise breaks the fff_print build.
This commit is contained in:
@@ -1086,7 +1086,7 @@ TEST_CASE("Belt brim lines all have the same width", "[SkirtBrim][belt]")
|
||||
REQUIRE(widths.size() > 10);
|
||||
const float lo = *std::min_element(widths.begin(), widths.end());
|
||||
const float hi = *std::max_element(widths.begin(), widths.end());
|
||||
CHECK_THAT(hi, Catch::Matchers::WithinRel(lo, 1e-4));
|
||||
CHECK_THAT(hi, Catch::Matchers::WithinRel(lo, 1e-4f));
|
||||
}
|
||||
|
||||
TEST_CASE("Belt apron survives another object printing at the same Z", "[SkirtBrim][belt]")
|
||||
|
||||
Reference in New Issue
Block a user