Merge branch 'main' into zaa

2026-03-18 18:10:35 +08:00
parent 12232deb7a f059472c0a
commit 4314f5d804
235 changed files with 3182 additions and 1591 deletions
--- a/src/libslic3r/PrintObjectSlice.cpp
+++ b/src/libslic3r/PrintObjectSlice.cpp
@@ -1220,7 +1220,7 @@ void PrintObject::slice_volumes()
        apply_fuzzy_skin_segmentation(*this, [print]() { print->throw_if_canceled(); });
    }

-    InterlockingGenerator::generate_interlocking_structure(this);
+    InterlockingGenerator::generate_interlocking_structure(this, [print]() { print->throw_if_canceled(); });
    m_print->throw_if_canceled();

    BOOST_LOG_TRIVIAL(debug) << "Slicing volumes - make_slices in parallel - begin";