Merge branch 'main' into weilun/speed_dial

src/OrcaSlicer.cpp

@@ -1387,6 +1387,25 @@ int CLI::run(int argc, char **argv)
     if (downward_check_option)
         downward_check = downward_check_option->value;
 
+    // --export-settings - writes its JSON to stdout, so reject every action or transform that may write there
+    // too (--info, --help, --orient, slicing and exporting). The allowed ones do nothing when nothing is
+    // sliced or exported.
+    if (std::find(m_actions.begin(), m_actions.end(), "export_settings") != m_actions.end() && m_config.opt_string("export_settings") == "-") {
+        static const std::set<std::string> stdout_compatible = { "export_settings", "uptodate", "load_defaultfila", "min_save",
+                                                                 "mtcpp", "mstpp", "no_check", "normative_check", "pipe" };
+        for (const std::vector<std::string> *opt_keys : { &m_actions, &m_transforms }) {
+            for (const std::string &opt_key : *opt_keys) {
+                if (stdout_compatible.count(opt_key) == 0) {
+                    std::string flag = opt_key;
+                    std::replace(flag.begin(), flag.end(), '_', '-');
+                    boost::nowide::cerr << "--export-settings - cannot be combined with --" << flag << std::endl;
+                    record_exit_reson(outfile_dir, CLI_INVALID_PARAMS, 0, cli_errors[CLI_INVALID_PARAMS], sliced_info);
+                    flush_and_exit(CLI_INVALID_PARAMS);
+                }
+            }
+        }
+    }
+
     bool start_gui = m_actions.empty() && !downward_check;
     if (start_gui) {
         BOOST_LOG_TRIVIAL(info) << "no action, start gui directly" << std::endl;
@@ -2010,19 +2029,21 @@ int CLI::run(int argc, char **argv)
         }
     };
 
-    auto resolve_preset = [&ensure_cli_preset_bundle](const std::string &file, DynamicPrintConfig &config,
+    // One resolver for the whole run, so presets from the same vendor tree share its load.
+    std::unique_ptr<PresetBundle> system_preset_resolver;
+    auto resolve_preset = [&ensure_cli_preset_bundle, &system_preset_resolver](const std::string &file, DynamicPrintConfig &config,
                                                                                std::string &config_type, const std::string &config_from,
                                                                                bool probe_type, std::string &error) {
         const auto *inherits = config.option<ConfigOptionString>(BBL_JSON_KEY_INHERITS);
         if (!probe_type && (inherits == nullptr || inherits->value.empty()))
             return true;
 
-        std::unique_ptr<PresetBundle> source_bundle;
         PresetBundle                 *bundle = nullptr;
         bool                          allow_source_manifest = false;
         if (config_from == "system") {
-            source_bundle         = std::make_unique<PresetBundle>();
-            bundle                = source_bundle.get();
+            if (!system_preset_resolver)
+                system_preset_resolver = std::make_unique<PresetBundle>();
+            bundle                = system_preset_resolver.get();
             allow_source_manifest = true;
         } else {
             bundle = ensure_cli_preset_bundle(error);
@@ -5348,7 +5369,7 @@ int CLI::run(int argc, char **argv)
                                 //skip this object due to be locked in plate
                                 ap.itemid = locked_aps.size();
                                 locked_aps.emplace_back(ap);
-                                boost::nowide::cout <<__FUNCTION__ << boost::format(": skip locked instance, obj_id %1%, instance_id %2%") % oidx % inst_idx;
+                                BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": skip locked instance, obj_id %1%, instance_id %2%") % oidx % inst_idx;
                             }
                         }
                     }
@@ -5937,7 +5958,11 @@ int CLI::run(int argc, char **argv)
             //FIXME check for mixing the FFF / SLA parameters.
             // or better save fff_print_config vs. sla_print_config
             //m_print_config.save(m_config.opt_string("save"));
-            m_print_config.save_to_json(m_config.opt_string(opt_key), std::string("project_settings"), std::string("project"), std::string(SoftFever_VERSION));
+            const std::string &settings_file = m_config.opt_string(opt_key);
+            if (settings_file == "-")
+                m_print_config.save_to_json(boost::nowide::cout, "project_settings", "project", SoftFever_VERSION, /*replace_invalid_utf8=*/true);
+            else
+                m_print_config.save_to_json(settings_file, std::string("project_settings"), std::string("project"), std::string(SoftFever_VERSION));
         } else if (opt_key == "info") {
             // --info works on unrepaired model
             for (Model &model : m_models) {
@@ -7715,6 +7740,13 @@ bool CLI::setup(int argc, char **argv)
         this->print_help();
         return false;
     }
+
+    // Orca: resolve here, while the process is still in the directory the user invoked it from.
+    // GUI_App's constructor moves the working directory to <data_dir>/log, long before the GUI
+    // opens these files in post_init(), and a relative path would then resolve against that.
+    for (std::string &input_file : m_input_files)
+        input_file = resolve_cli_input_path(input_file);
+
     // Parse actions and transform options.
     for (auto const &opt_key : opt_order) {
         if (cli_actions_config_def.has(opt_key))

src/libslic3r/CMakeLists.txt

@@ -260,6 +260,8 @@ set(lisbslic3r_sources
     GCode/SmallAreaInfillFlowCompensator.hpp
     GCode/SpiralVase.cpp
     GCode/SpiralVase.hpp
+    GCode/WipePathHelpers.cpp
+    GCode/WipePathHelpers.hpp
     GCode/ThumbnailData.cpp
     GCode/ThumbnailData.hpp
     GCode/Thumbnails.cpp

src/libslic3r/Config.cpp

@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <assert.h>
 #include <fstream>
+#include <sstream>
 #include <iostream>
 #include <iomanip>
 #include <regex>
@@ -1515,6 +1516,19 @@ std::optional<PluginCapabilityRef> parse_capability_ref(const std::string& value
 
 //BBS: add json support
 void ConfigBase::save_to_json(const std::string &file, const std::string &name, const std::string &from, const std::string &version) const
+{
+    // Serialize first: if that throws (invalid UTF-8), the existing file stays untouched.
+    std::ostringstream ss;
+    this->save_to_json(ss, name, from, version);
+    boost::nowide::ofstream c;
+    c.open(file, std::ios::out | std::ios::trunc);
+    c << ss.str();
+    c.close();
+
+    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", saved config to %1%\n")%file;
+}
+
+void ConfigBase::save_to_json(std::ostream &os, const std::string &name, const std::string &from, const std::string &version, bool replace_invalid_utf8) const
 {
     json j;
     //record the headers
@@ -1561,12 +1575,7 @@ void ConfigBase::save_to_json(const std::string &file, const std::string &name,
             j["plugins"] = unique_refs;
     }
 
-    boost::nowide::ofstream c;
-    c.open(file, std::ios::out | std::ios::trunc);
-    c << j.dump(1, '\t') << std::endl;
-    c.close();
-
-    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", saved config to %1%\n")%file;
+    os << j.dump(1, '\t', false, replace_invalid_utf8 ? json::error_handler_t::replace : json::error_handler_t::strict) << std::endl;
 }
 
 void ConfigBase::save(const std::string &file) const

src/libslic3r/Config.hpp

@@ -2825,6 +2825,9 @@ public:
 
     //BBS: add json support
     void save_to_json(const std::string &file, const std::string &name, const std::string &from, const std::string &version) const;
+    // Same document, written to a stream. Invalid UTF-8 in a string value throws nlohmann's type_error unless
+    // replace_invalid_utf8 is set, which writes U+FFFD instead (for callers such as stdout with no handler).
+    void save_to_json(std::ostream &os, const std::string &name, const std::string &from, const std::string &version, bool replace_invalid_utf8 = false) const;
 
     // Rebuild the in-memory "plugins" manifest (the "name;uuid;capability" references the plugin
     // dispatchers consume) from the plugin-backed options via the registered resolver. save_to_json()

src/libslic3r/Fill/Fill.cpp

@@ -1595,6 +1595,25 @@ Polylines Layer::generate_sparse_infill_polylines_for_anchoring(FillAdaptive::Oc
     return sparse_infill_polylines;
 }
 
+// Returns the filament id (1-based) the region is ironed with, or -1 when the
+// region is not ironed. AllSolid always irons. TopSurfaces and TopmostOnly need
+// either some top shells or, in spiral mode, more than one bottom shell, and
+// TopmostOnly additionally needs the layer to be the topmost one.
+int Layer::choose_ironing_extruder(const PrintRegionConfig &cfg,
+                                   bool spiral_mode,
+                                   bool is_topmost_layer)
+{
+    if (cfg.ironing_type == IroningType::NoIroning)
+        return -1;
+    const bool gate = (cfg.ironing_type == IroningType::AllSolid)
+        || ((cfg.top_shell_layers > 0 || (spiral_mode && cfg.bottom_shell_layers > 1))
+            && (cfg.ironing_type == IroningType::TopSurfaces
+                || (cfg.ironing_type == IroningType::TopmostOnly && is_topmost_layer)));
+    if (!gate)
+        return -1;
+    return cfg.top_surface_filament_id;
+}
+
 // Create ironing extrusions over top surfaces.
 void Layer::make_ironing()
 {
@@ -1664,19 +1683,10 @@ void Layer::make_ironing()
 		if (! layerm->slices.empty()) {
 			IroningParams ironing_params;
 			const PrintRegionConfig &config = layerm->region().config();
-			if (config.ironing_type != IroningType::NoIroning &&
-			    (config.ironing_type == IroningType::AllSolid ||
-				    ((config.top_shell_layers > 0 || (this->object()->print()->config().spiral_mode && config.bottom_shell_layers > 1)) &&
-					    (config.ironing_type == IroningType::TopSurfaces ||
-					        (config.ironing_type == IroningType::TopmostOnly && layerm->layer()->upper_layer == nullptr))))) {
-				if (config.outer_wall_filament_id == config.top_surface_filament_id || config.wall_loops == 0) {
-					// Iron the whole face.
-					ironing_params.extruder = config.top_surface_filament_id;
-				} else {
-					// Iron just the infill.
-					ironing_params.extruder = config.top_surface_filament_id;
-				}
-			}
+			ironing_params.extruder = Layer::choose_ironing_extruder(
+				config,
+				/*spiral_mode=*/this->object()->print()->config().spiral_mode,
+				/*is_topmost_layer=*/layerm->layer()->upper_layer == nullptr);
 			if (ironing_params.extruder != -1) {
 				//TODO just_infill is currently not used.
 				ironing_params.just_infill 	= false;

src/libslic3r/GCode.cpp

@@ -1,5 +1,6 @@
 #include "BoundingBox.hpp"
 #include "Config.hpp"
+#include "GCode/WipePathHelpers.hpp"
 #include "GCodeWriter.hpp"
 #include "Polygon.hpp"
 #include "PrintConfig.hpp"
@@ -438,7 +439,6 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
         auto& writer = gcodegen.writer();
         auto& config = gcodegen.config();
         auto extruder = writer.filament();
-        auto extruder_id = extruder->extruder_id();
         auto last_pos = gcodegen.last_pos();
         
         // Declare & initialize retraction lengths
@@ -475,13 +475,13 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
         wipe_speed = std::max(wipe_speed, 10.0);
 
         // Process wipe path & calculate wipe path length
-        double wipe_dist = scale_(config.wipe_distance.get_at(extruder_id));
+        double wipe_dist = scale_(config.wipe_distance.get_at(extruder->config_index()));
         Polyline wipe_path = {last_pos};
         wipe_path.append(this->path.points.begin() + 1, this->path.points.end());
         double wipe_path_length = std::min(wipe_path.length(), wipe_dist);
 
         // Calculate the maximum retraction amount during wipe
-        retraction_length_during_wipe = config.retraction_speed.get_at(extruder_id) * 
+        retraction_length_during_wipe = config.retraction_speed.get_at(extruder->config_index()) *
             unscale_(wipe_path_length) / wipe_speed;
 
         // If the maximum retraction amount during wipe is too small,
@@ -564,6 +564,16 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
         return default_value;
     }
 
+    // Orca: rebuild the stored wipe path while preserving Polyline's boundary deduplication.
+    void Wipe::update_path(const ExtrusionPaths &paths, bool reverse)
+    {
+        reset_path();
+        for (const ExtrusionPath& extrusion_path : paths)
+            path.append(extrusion_path.polyline.to_polyline());
+        if (reverse)
+            path.reverse();
+    }
+
     std::string Wipe::wipe(GCode& gcodegen,double length, bool toolchange, bool is_last)
     {
         std::string gcode;
@@ -616,14 +626,11 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
                 if (gcodegen.enable_cooling_markers() && !is_last)
                     cooling_mark = /*gcodegen.config().role_based_wipe_speed ? ";_EXTERNAL_PERIMETER" : */";_WIPE";
 
+                // Orca: set speed once because wipe_speed is constant for all segments.
                 gcode += gcodegen.writer().set_speed(_wipe_speed * 60, "", cooling_mark);
                 for (const Line& line : wipe_path.lines()) {
                     double segment_length = line.length();
                     double dE = length * (segment_length / wipe_dist);
-                    //BBS: fix this FIXME
-                    //FIXME one shall not generate the unnecessary G1 Fxxx commands, here wipe_speed is a constant inside this cycle.
-                    // Is it here for the cooling markers? Or should it be outside of the cycle?
-                    //gcode += gcodegen.writer().set_speed(wipe_speed * 60, "", gcodegen.enable_cooling_markers() ? ";_WIPE" : "");
                     gcode += gcodegen.writer().extrude_to_xy(
                         gcodegen.point_to_gcode(line.b),
                         -dE,
@@ -2901,6 +2908,19 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
     const bool skip_config_block = print.config().gcode_skip_config_block;
     const WipeTowerType wipe_tower_type = print.wipe_tower_type();
     m_calib_config.clear();
+    // Orca: Calibration overrides are reapplied after object/region settings in _extrude().
+    // Keep inward wiping from masking retraction and pressure advance artifacts.
+    switch (print.calib_mode()) {
+    case CalibMode::Calib_PA_Line:
+    case CalibMode::Calib_PA_Pattern:
+    case CalibMode::Calib_PA_Tower:
+    case CalibMode::Calib_Auto_PA_Line:
+    case CalibMode::Calib_Retraction_tower:
+        m_calib_config.set_key_value("wipe_inward", new ConfigOptionBool(false));
+        break;
+    default:
+        break;
+    }
     // resets analyzer's tracking data
     m_last_height  = 0.f;
     m_last_layer_z = 0.f;
@@ -3555,7 +3575,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
 
         auto used_filaments = print.get_slice_used_filaments(false);
         this->placeholder_parser().set("is_all_bbl_filament", std::all_of(used_filaments.begin(), used_filaments.end(), [&](auto idx) {
-            return m_config.filament_vendor.values[idx] == "Bambu Lab";
+            return m_config.filament_vendor.get_at(idx) == "Bambu Lab";
             }));
 
         //add during_print_exhaust_fan_speed
@@ -3572,7 +3592,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
         this->placeholder_parser().set("outer_wall_volumetric_speed", new ConfigOptionFloat(outer_wall_volumetric_speed));
 
         auto first_layer_filaments = print.get_slice_used_filaments(true);
-        bool has_tpu_in_first_layer = std::any_of(first_layer_filaments.begin(), first_layer_filaments.end(), [&](unsigned int idx) { return m_config.filament_type.values[idx] == "TPU"; });
+        bool has_tpu_in_first_layer = std::any_of(first_layer_filaments.begin(), first_layer_filaments.end(), [&](unsigned int idx) { return m_config.filament_type.get_at(idx) == "TPU"; });
         this->placeholder_parser().set("has_tpu_in_first_layer", new ConfigOptionBool(has_tpu_in_first_layer));
 
         if (print.calib_params().mode == CalibMode::Calib_PA_Line) {
@@ -7204,7 +7224,8 @@ std::string GCode::extrude_loop(const ExtrusionLoop&        loop_ref,
                                 const std::string&          description,
                                 double                      speed,
                                 const ExtrusionEntitiesPtr& region_perimeters,
-                                const Point*                start_point)
+                                const Point*                start_point,
+                                const WipeInwardSupport*     wipe_support)
 {
     // get a copy; don't modify the orientation of the original loop object otherwise
     // next copies (if any) would not detect the correct orientation
@@ -7434,63 +7455,80 @@ std::string GCode::extrude_loop(const ExtrusionLoop&        loop_ref,
         m_processor.result().print_statistics.total_seam_scarf_distance += static_cast<float>(seam_scarf_distance_mm);
     }
 
-    // BBS
+    // Orca: share the post-extrusion nozzle position between wipe_inward and wipe_on_loops.
+    const bool is_ccw = loop.is_counter_clockwise();
+
+    std::optional<Point> wipe_on_loops_dest;
+    if (m_config.wipe_on_loops.value && paths.back().role() == erExternalPerimeter &&
+        m_layer != nullptr && m_config.wall_loops.value > 1 && paths.front().size() >= 2 &&
+        paths.back().polyline.points.size() >= 2)
+        wipe_on_loops_dest = wipe_on_loops_destination(paths, scale_(nozzle_diameter), is_ccw, is_hole);
+
+    bool wipe_inward_applied = false;
+    // Orca: store loop paths in print order because inward offsets use this orientation.
     if (m_wipe.enable && FILAMENT_CONFIG(wipe)) {
-        m_wipe.path = Polyline();
-        for (ExtrusionPath &path : paths) {
-            //BBS: Don't need to save duplicated point into wipe path
-            if (!m_wipe.path.empty() && !path.empty() &&
-                m_wipe.path.last_point() == Point(path.first_point().x(), path.first_point().y())) {
-                // Convert Points3 to Points
-                for (auto it = path.polyline.points.begin() + 1; it != path.polyline.points.end(); ++it)
-                    m_wipe.path.append(Point(it->x(), it->y()));
-            } else
-                m_wipe.path.append(path.polyline.to_polyline());  // TODO: don't limit wipe to last path
+        m_wipe.update_path(paths);
+
+        // Orca: loop wipe paths retain print direction. Their material side is
+        // therefore left for CCW contours and right for CW contours, with the
+        // result inverted for holes. Only external perimeters are eligible.
+        // Calibration overrides are applied during extrusion, after the region
+        // context was created. Check the effective setting again at execution.
+        if (m_config.wipe_inward && m_config.wipe_inward_distance.value > 0. &&
+            wipe_support != nullptr && !wipe_support->inner_lines.empty() &&
+            // A loop's role is its first path's role. An overhanging start must
+            // not hide ordinary external-wall segments elsewhere in the loop.
+            std::any_of(paths.begin(), paths.end(),
+                [](const ExtrusionPath &path) { return is_external_perimeter(path.role()); }) &&
+            m_wipe.path.points.size() >= 2) {
+            // Orca: use the actual extrusion width from the path, not the config
+            // value — outer_wall_line_width=0 (Auto) would make get_abs_value
+            // return 0 and silently disable the feature, and Arachne may produce
+            // a different width than the config default.
+            const double outer_wall_line_width = paths.front().width;
+            const double requested_offset = m_config.wipe_inward_distance.get_abs_value(outer_wall_line_width);
+            const double offset_dist = scale_(std::min(requested_offset, outer_wall_line_width));
+            if (offset_dist > SCALED_EPSILON) {
+                const Point seam_start = paths.front().first_point();
+                const Point seam_end   = paths.back().last_point();
+                const Point wipe_start = wipe_on_loops_dest.value_or(seam_end);
+                const double max_wipe_length = scale_(FILAMENT_CONFIG(wipe_distance));
+                // Orca: Wipe::wipe() replaces points[0] with last_pos and executes
+                // from points[1]. The helper preserves that sentinel and atomically
+                // replaces the remaining points, or leaves the path untouched.
+                // Orca: a configured wall count does not guarantee that Arachne
+                // generated an adjacent wall for this particular loop. Only
+                // earlier entities are considered because later walls have
+                // not been printed yet (for example with Outer/Inner order).
+                // Inner walls determine the material side; every earlier wall
+                // remains available to validate the executable wipe path.
+                const double support_distance = scale_(std::max(nozzle_diameter, outer_wall_line_width));
+                Polyline inward_path = m_wipe.path;
+                if (offset_wipe_path_toward_support(
+                        inward_path, seam_start, seam_end, wipe_start,
+                        wipe_offset_direction(is_ccw, is_hole), offset_dist, max_wipe_length,
+                        wipe_support->inner_lines, wipe_support->printed_lines,
+                        m_wipe.path.lines(), support_distance)) {
+                    m_wipe.path = std::move(inward_path);
+                    wipe_inward_applied = true;
+                }
+            }
         }
     }
 
-    // make a little move inwards before leaving loop
-    if (m_config.wipe_on_loops.value && paths.back().role() == erExternalPerimeter && m_layer != NULL && m_config.wall_loops.value > 1 && paths.front().size() >= 2 && paths.back().polyline.points.size() >= 3) {
-        // detect angle between last and first segment
-        // the side depends on the original winding order of the polygon (inwards for contours, outwards for holes)
-        //FIXME improve the algorithm in case the loop is tiny.
-        //FIXME improve the algorithm in case the loop is split into segments with a low number of points (see the Point b query).
-        const Point3 &a3 = paths.front().polyline.points[1];  // second point
-        Point a = Point(a3.x(), a3.y());
-        const Point3 &b3 = *(paths.back().polyline.points.end()-3);       // second to last point
-        Point b = Point(b3.x(), b3.y());
-        if (is_hole == loop.is_counter_clockwise()) {
-            // swap points
-            Point c = a; a = b; b = c;
-        }
-
-        double angle = paths.front().first_point().ccw_angle(a, b) / 3;
-
-        // turn inwards if contour, turn outwards if hole
-        if (is_hole == loop.is_counter_clockwise()) angle *= -1;
-
-        // create the destination point along the first segment and rotate it
-        // we make sure we don't exceed the segment length because we don't know
-        // the rotation of the second segment so we might cross the object boundary
-        Vec2d  p1 = paths.front().polyline.points.front().cast<double>().head<2>();
-        Vec2d  p2 = paths.front().polyline.points[1].cast<double>().head<2>();
-        Vec2d  v  = p2 - p1;
-        double nd = scale_(EXTRUDER_CONFIG(nozzle_diameter));
-        double l2 = v.squaredNorm();
-        // Shift by no more than a nozzle diameter.
-        //FIXME Hiding the seams will not work nicely for very densely discretized contours!
-        //BBS. shorten the travel distant before the wipe path
-        double threshold = 0.2;
-        Point  pt = (p1 + v * threshold).cast<coord_t>();
-        if (nd * nd < l2)
-            pt = (p1 + threshold * v * (nd / sqrt(l2))).cast<coord_t>();
-        //Point pt = ((nd * nd >= l2) ? (p1+v*0.4): (p1 + 0.2 * v * (nd / sqrt(l2)))).cast<coord_t>();
-        const Point3 &center3 = paths.front().polyline.points.front();
-        pt.rotate(angle, Point(center3.x(), center3.y()));
-        // generate the travel move
-        gcode += m_writer.extrude_to_xy(this->point_to_gcode(pt), 0, "move inwards before travel", true);
+    // Orca: make the configured inward move before leaving the loop.
+    if (wipe_on_loops_dest) {
+        gcode += m_writer.extrude_to_xy(
+            this->point_to_gcode(*wipe_on_loops_dest), 0, "move inwards before travel", true);
+        this->set_last_pos(*wipe_on_loops_dest);
     }
 
+    // Execute the accepted path before another extrusion replaces it. Wiping
+    // must not force retraction or Z-hop across a short travel to the next wall.
+    // Ordinary travel planning decides whether to retract from the new position.
+    if (wipe_inward_applied)
+        gcode += m_wipe.wipe(*this, 0.);
+
     return gcode;
 }
 
@@ -7524,21 +7562,9 @@ std::string GCode::extrude_multi_path(const ExtrusionMultiPath& multipath, const
         m_multi_flow_segment_path_pa_set = true;
     }
 
-    // BBS
-    if (m_wipe.enable && FILAMENT_CONFIG(wipe)) {
-        m_wipe.path = Polyline();
-        for (const ExtrusionPath &path : multipath.paths) {
-            //BBS: Don't need to save duplicated point into wipe path
-            if (!m_wipe.path.empty() && !path.empty() &&
-                m_wipe.path.last_point() == Point(path.first_point().x(), path.first_point().y())) {
-                // Convert Points3 to Points
-                for (auto it = path.polyline.points.begin() + 1; it != path.polyline.points.end(); ++it)
-                    m_wipe.path.append(Point(it->x(), it->y()));
-            } else
-                m_wipe.path.append(path.polyline.to_polyline()); // TODO: don't limit wipe to last path
-        }
-        m_wipe.path.reverse();
-    }
+    // Orca: multipath wipes retrace the extrusion in reverse order.
+    if (m_wipe.enable && FILAMENT_CONFIG(wipe))
+        m_wipe.update_path(multipath.paths, true);
 
     return gcode;
 }
@@ -7546,14 +7572,15 @@ std::string GCode::extrude_multi_path(const ExtrusionMultiPath& multipath, const
 std::string GCode::extrude_entity(const ExtrusionEntity&      entity,
                                   const std::string&          description,
                                   double                      speed,
-                                  const ExtrusionEntitiesPtr& region_perimeters)
+                                  const ExtrusionEntitiesPtr& region_perimeters,
+                                  const WipeInwardSupport*     wipe_support)
 {
     if (const ExtrusionPath* path = dynamic_cast<const ExtrusionPath*>(&entity))
         return this->extrude_path(*path, description, speed);
     else if (const ExtrusionMultiPath* multipath = dynamic_cast<const ExtrusionMultiPath*>(&entity))
         return this->extrude_multi_path(*multipath, description, speed);
     else if (const ExtrusionLoop* loop = dynamic_cast<const ExtrusionLoop*>(&entity))
-        return this->extrude_loop(*loop, description, speed, region_perimeters);
+        return this->extrude_loop(*loop, description, speed, region_perimeters, nullptr, wipe_support);
     else
         throw Slic3r::InvalidArgument("Invalid argument supplied to extrude()");
     return "";
@@ -7567,6 +7594,7 @@ std::string GCode::extrude_path(const ExtrusionPath& path, const std::string& de
     //    description += ExtrusionEntity::role_to_string(path.role());
     std::string gcode = this->_extrude(path, description, speed);
     if (m_wipe.enable && FILAMENT_CONFIG(wipe)) {
+        m_wipe.reset_path();
         m_wipe.path = path.polyline.to_polyline();
         if (is_tree(this->config().support_type) && is_support(path.role())) {
             if ((m_wipe.path.first_point() - m_wipe.path.last_point()).cast<double>().norm() > scale_(0.2)) {
@@ -7599,8 +7627,19 @@ std::string GCode::extrude_perimeters(const Print &print, const std::vector<Obje
                 : (m_config.is_infill_first == is_infill_first);
             if (!should_print) continue;
 
-            for (const ExtrusionEntity* ee : region.perimeters)
-                gcode += this->extrude_entity(*ee, "perimeter", -1., region.perimeters);
+            // Build the printed prefix once in emission order, scoped to this
+            // region. Disabled or zero-length wipes need no support geometry.
+            std::optional<WipeInwardSupport> wipe_support;
+            if (m_wipe.enable && FILAMENT_CONFIG(wipe) && m_config.wipe_inward &&
+                m_config.wipe_inward_distance.value > 0. &&
+                scale_(FILAMENT_CONFIG(wipe_distance)) > SCALED_EPSILON)
+                wipe_support.emplace();
+            for (const ExtrusionEntity* ee : region.perimeters) {
+                gcode += this->extrude_entity(*ee, "perimeter", -1., region.perimeters,
+                                             wipe_support ? &*wipe_support : nullptr);
+                if (wipe_support)
+                    wipe_support->append(*ee);
+            }
         }
     return gcode;
 }
@@ -7841,7 +7880,8 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
     // path is 2D. But in slope lift case, lift z is done in travel_to function.
     // Add m_need_change_layer_lift_z when change_layer in case of no lift if m_last_pos is equal to path.first_point() by chance
     Point first_point = path.first_point();
-    if (!m_last_pos_defined || m_last_pos.to_point() != first_point || m_need_change_layer_lift_z || slope_need_z_travel) {
+    if (!m_last_pos_defined || m_last_pos.to_point() != first_point || m_need_change_layer_lift_z ||
+        slope_need_z_travel) {
         const bool _last_pos_undefined = !m_last_pos_defined;
 
         double z = DBL_MAX;
@@ -9474,12 +9514,14 @@ std::string GCode::set_extruder(unsigned int new_filament_id, double print_z, bo
             if (old_filament_id_in_new_extruder == -1)
                 wipe_volume = 0;
             else {
-                wipe_volume = flush_matrix[old_filament_id_in_new_extruder * number_of_extruders + new_filament_id];
+                size_t flush_idx = size_t(old_filament_id_in_new_extruder) * number_of_extruders + new_filament_id;
+                wipe_volume = flush_idx < flush_matrix.size() ? flush_matrix[flush_idx] : 0.f;
                 wipe_volume *= m_config.flush_multiplier.get_at(new_extruder_id);
             }
         }
         else {
-            wipe_volume = flush_matrix[old_filament_id * number_of_extruders + new_filament_id];
+            size_t flush_idx = size_t(old_filament_id) * number_of_extruders + new_filament_id;
+            wipe_volume = flush_idx < flush_matrix.size() ? flush_matrix[flush_idx] : 0.f;
             wipe_volume *= m_config.flush_multiplier.get_at(new_extruder_id);  // if is multi_extruder only use the fist extruder matrix
         }
         wipe_volume = std::max(0.f, wipe_volume-grab_purge_volume);

src/libslic3r/GCode.hpp

@@ -39,6 +39,7 @@ namespace Slic3r {
 
 // Forward declarations.
 class GCode;
+struct WipeInwardSupport;
 
 namespace CustomGCode{ struct Item; }
 struct PrintInstance;
@@ -61,7 +62,7 @@ public:
     bool enable;
     Polyline path;
 
-    // Orca:
+    // Orca: retraction portions emitted before, during, and after the wipe move.
     struct RetractionValues{
         double retraction_length_before_wipe = 0.;
         double retraction_length_during_wipe = 0.;
@@ -73,8 +74,10 @@ public:
     void reset_path() { this->path = Polyline(); }
     std::string wipe(GCode &gcodegen, double length, bool toolchange = false, bool is_last = false);
 
-    // Orca:
+    // Orca: calculate the retraction portions that can be emitted at wipe speed.
     RetractionValues calculateWipeRetractionLengths(GCode& gcodegen, bool toolchange);
+    // Orca: rebuild the stored path while deduplicating shared path boundaries.
+    void update_path(const ExtrusionPaths &paths, bool reverse = false);
 };
 
 class WipeTowerIntegration {
@@ -430,14 +433,16 @@ private:
     std::string extrude_entity(const ExtrusionEntity&      entity,
                                const std::string&          description       = "",
                                double                      speed             = -1.,
-                               const ExtrusionEntitiesPtr& region_perimeters = ExtrusionEntitiesPtr());
+                               const ExtrusionEntitiesPtr& region_perimeters = ExtrusionEntitiesPtr(),
+                               const WipeInwardSupport*     wipe_support      = nullptr);
     // Orca: pass the complete collection of region perimeters to the extrude loop to check whether the wipe before external loop
     // should be executed
     std::string extrude_loop(const ExtrusionLoop&        loop,
                              const std::string&          description,
                              double                      speed             = -1.,
                              const ExtrusionEntitiesPtr& region_perimeters = ExtrusionEntitiesPtr(),
-                             const Point*                start_point       = nullptr);
+                             const Point*                start_point       = nullptr,
+                             const WipeInwardSupport*     wipe_support      = nullptr);
     std::string extrude_multi_path(const ExtrusionMultiPath& multipath, const std::string& description = "", double speed = -1.);
     std::string extrude_path(const ExtrusionPath& path, const std::string& description = "", double speed = -1.);
 

src/libslic3r/GCode/GCodeProcessor.cpp

@@ -7596,8 +7596,8 @@ void GCodeProcessor::update_slice_warnings()
         if (used_filaments[idx] < m_result.required_nozzle_HRC.size())
             filament_hrc = m_result.required_nozzle_HRC[used_filaments[idx]];
 
-        int filament_extruder_id = m_filament_maps[used_filaments[idx]];
-        int extruder_hrc = nozzle_hrc_lists[filament_extruder_id];
+        int filament_extruder_id = used_filaments[idx] < m_filament_maps.size() ? m_filament_maps[used_filaments[idx]] : -1;
+        int extruder_hrc = (filament_extruder_id >= 0 && (size_t) filament_extruder_id < nozzle_hrc_lists.size()) ? nozzle_hrc_lists[filament_extruder_id] : 0;
 
         BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": Check HRC: filament:%1%, hrc=%2%, extruder:%3%, hrc:%4%") % used_filaments[idx] % filament_hrc % filament_extruder_id % extruder_hrc;
 

src/libslic3r/GCode/ToolOrdering.cpp

@@ -1488,10 +1488,10 @@ static FilamentGroupContext build_filament_group_context(
 
     auto machine_filament_info = build_machine_filaments(print->get_extruder_filament_info(), extruder_ams_counts, ignore_ext_filament);
 
-    std::vector<std::string>   filament_types      = print_config.filament_type.values;
-    std::vector<std::string>   filament_colours    = print_config.filament_colour.values;
-    std::vector<unsigned char> filament_is_support = print_config.filament_is_support.values;
-    std::vector<std::string>   filament_ids        = print_config.filament_ids.values;
+    // The grouping code walks filament_ids and indexes filament_info by the same position.
+    std::vector<std::string> filament_ids = print_config.filament_ids.values;
+    if (filament_ids.size() > filament_nums)
+        filament_ids.resize(filament_nums);
 
     FGMode fg_mode = mode == FilamentMapMode::fmmAutoForMatch ? FGMode::MatchMode : FGMode::FlushMode;
     context.model_info.flush_matrix          = std::move(nozzle_flush_mtx);
@@ -1500,11 +1500,14 @@ static FilamentGroupContext build_filament_group_context(
     context.model_info.filament_ids          = filament_ids;
     context.model_info.unprintable_volumes   = unprintable_volumes;
 
-    for (size_t idx = 0; idx < filament_types.size(); ++idx) {
+    // Consumers index filament_info by filament id, so it must span the filament count: a partial
+    // or legacy config can leave any of these arrays short, and get_at clamps.
+    context.model_info.filament_info.reserve(filament_nums);
+    for (size_t idx = 0; idx < filament_nums; ++idx) {
         FilamentGroupUtils::FilamentInfo info;
-        info.color      = filament_colours[idx];
-        info.type       = filament_types[idx];
-        info.is_support = filament_is_support[idx];
+        info.color      = print_config.filament_colour.get_at(idx);
+        info.type       = print_config.filament_type.get_at(idx);
+        info.is_support = print_config.filament_is_support.get_at(idx);
         context.model_info.filament_info.emplace_back(std::move(info));
     }
 

src/libslic3r/GCode/WipePathHelpers.cpp

@@ -0,0 +1,920 @@
+#include "WipePathHelpers.hpp"
+
+#include "../AABBTreeLines.hpp"
+
+#include <algorithm>
+#include <cassert>
+#include <cmath>
+#include <limits>
+#include <tuple>
+
+namespace Slic3r {
+
+void WipeInwardSupport::append(const ExtrusionEntity &entity)
+{
+    const ExtrusionPaths *paths = nullptr;
+    if (const auto *loop = dynamic_cast<const ExtrusionLoop *>(&entity))
+        paths = &loop->paths;
+    else if (const auto *multipath = dynamic_cast<const ExtrusionMultiPath *>(&entity))
+        paths = &multipath->paths;
+
+    // A loop's role is its first path's role. An overhanging start must not
+    // hide the ordinary inner-wall segments elsewhere in the same loop.
+    const bool is_inner = paths ? std::any_of(paths->begin(), paths->end(),
+        [](const ExtrusionPath &path) { return is_internal_perimeter(path.role()); }) :
+        is_internal_perimeter(entity.role());
+    const Lines lines = entity.as_polyline().lines();
+    printed_lines.insert(printed_lines.end(), lines.begin(), lines.end());
+    if (is_inner)
+        inner_lines.insert(inner_lines.end(), lines.begin(), lines.end());
+}
+
+// Orca: miter limit ratio. Matches DefaultMiterLimit from ClipperUtils.hpp.
+// When the miter join extends more than miter_limit * offset_dist from the
+// original vertex, the miter is replaced by a bevel join.
+static constexpr double miter_limit = 3.0;
+
+// Orca: threshold for detecting near-reversal (backtracking spike).
+// Normalized dot product below this means the segments point in nearly
+// opposite directions (angle > ~172°). Offsetting such a path is unsafe.
+static constexpr double reversal_dot_threshold = -0.99;
+
+// Orca: candidates pointing more than 60 degrees away from the selected inner
+// wall are too tangent to distinguish the material side reliably at a cusp.
+static constexpr double min_support_alignment = 0.5;
+
+// Keep a scaled-coordinate rounding floor while allowing the tolerance to
+// follow the relevant offset or path length. Clearance allows a larger fraction.
+static double wipe_tolerance(double distance, double relative_tolerance = 0.1)
+{
+    return std::max(4. * SCALED_EPSILON, relative_tolerance * distance);
+}
+
+Point sample_path_at_distance(const ExtrusionPaths &paths, bool forward, double target)
+{
+    assert(!paths.empty());
+    if (paths.empty())
+        return Point(0, 0);
+
+    double remaining = target;
+    Point result = forward ? paths.front().first_point() : paths.back().last_point();
+    for (int pi = forward ? 0 : (int)paths.size() - 1;
+         pi >= 0 && pi < (int)paths.size() && remaining > 0.;
+         pi += forward ? 1 : -1) {
+        const Points3 &pts = paths[pi].polyline.points;
+        for (int i = forward ? 0 : (int)pts.size() - 1;
+             remaining > 0. && (forward ? i + 1 < (int)pts.size() : i > 0);
+             i += forward ? 1 : -1) {
+            const int j = forward ? i + 1 : i - 1;
+            const Point cur(pts[i].x(), pts[i].y());
+            const Point next(pts[j].x(), pts[j].y());
+            const double segment_length = (next - cur).cast<double>().norm();
+            if (segment_length < SCALED_EPSILON)
+                continue;
+            if (remaining <= segment_length) {
+                const double ratio = remaining / segment_length;
+                return Point(coord_t(cur.x() + ratio * (next.x() - cur.x())),
+                             coord_t(cur.y() + ratio * (next.y() - cur.y())));
+            }
+            remaining -= segment_length;
+            result = next;
+        }
+    }
+    return result;
+}
+
+// Orca: consecutive duplicates carry no path length and can be removed safely.
+// A reversal, however, is real travelled distance: removing its vertex would
+// replace a long backtracking wipe with a short, unrelated shortcut.
+static bool prepare_source(Points &pts)
+{
+    pts.erase(std::unique(pts.begin(), pts.end()), pts.end());
+
+    if (pts.size() < 2)
+        return false;
+
+    for (size_t i = 1; i + 1 < pts.size(); ++i) {
+        const Vec2d v_prev = (pts[i] - pts[i - 1]).cast<double>();
+        const Vec2d v_next = (pts[i + 1] - pts[i]).cast<double>();
+        const double dot = v_prev.dot(v_next) / (v_prev.norm() * v_next.norm());
+        if (dot < reversal_dot_threshold)
+            return false;
+    }
+    return true;
+}
+
+static bool build_offset_polyline(const Points &original, int dir, double offset_dist,
+                                  Points &result, size_t &first_join_index)
+{
+    if (original.size() < 2)
+        return false;
+
+    // Orca: collapse all consecutive duplicates first, then reject any
+    // backtracking in the cleaned path instead of replacing travelled distance
+    // with a shortcut.
+    Points source = original;
+    if (! prepare_source(source))
+        return false;
+
+    const size_t n = source.size();
+
+    // Orca: compute the perpendicular offset for segment i->i+1 as an infinite Line.
+    auto offset_segment = [dir, offset_dist](const Point &a, const Point &b) -> Line {
+        Vec2d  v = (b - a).cast<double>();
+        double len = v.norm();
+        Vec2d  perp(0, 0);
+        if (len > SCALED_EPSILON)
+            perp = Vec2d(-v.y(), v.x()) * (dir * offset_dist / len);
+        return Line(Point(coord_t(a.x() + perp.x()), coord_t(a.y() + perp.y())),
+                    Point(coord_t(b.x() + perp.x()), coord_t(b.y() + perp.y())));
+    };
+
+    result.clear();
+    result.reserve(n);
+    first_join_index = 0;
+
+    // Orca: the first point is perpendicular to the first segment.
+    Line l_prev = offset_segment(source[0], source[1]);
+    result.push_back(l_prev.a);
+
+    // Orca: use the analytic intersection of adjacent offset segments for a
+    // miter join. Intersecting the already rounded Line endpoints amplifies
+    // coordinate quantization when the source segments are nearly parallel.
+    for (size_t i = 1; i + 1 < n; ++i) {
+        Line l_next = offset_segment(source[i], source[i + 1]);
+        const Vec2d previous = (source[i] - source[i - 1]).cast<double>().normalized();
+        const Vec2d next = (source[i + 1] - source[i]).cast<double>().normalized();
+        const double denominator = 1. + previous.dot(next);
+
+        bool need_bevel = denominator <= EPSILON;
+        Point pt;
+        if (! need_bevel) {
+            const Vec2d previous_normal(-previous.y(), previous.x());
+            const Vec2d next_normal(-next.y(), next.x());
+            const Vec2d miter = (previous_normal + next_normal) * (dir * offset_dist / denominator);
+            if (miter.norm() > miter_limit * offset_dist) {
+                need_bevel = true;
+            } else {
+                pt = Point(coord_t(source[i].x() + miter.x()),
+                           coord_t(source[i].y() + miter.y()));
+            }
+        }
+
+        if (need_bevel) {
+            result.push_back(l_prev.b);
+            if (l_next.a != result.back())
+                result.push_back(l_next.a);
+        } else {
+            result.push_back(pt);
+        }
+        if (i == 1)
+            first_join_index = result.size() - 1;
+        l_prev = l_next;
+    }
+
+    // Orca: the last point is perpendicular to the last segment.
+    result.push_back(l_prev.b);
+
+    return true;
+}
+
+int wipe_offset_direction(bool is_ccw, bool is_hole)
+{
+    const int loop_inside = is_ccw ? +1 : -1;
+    return is_hole ? -loop_inside : loop_inside;
+}
+
+static bool starts_by_backtracking(const Polyline &path, Point actual_start)
+{
+    if (path.points.size() < 3)
+        return false;
+    // Orca: points[0] is only a storage sentinel; use the nozzle position for
+    // the executable connector, particularly after a wipe_on_loops pre-move.
+    const Vec2d connector = (path.points[1] - actual_start).cast<double>();
+    const Vec2d outgoing = (path.points[2] - path.points[1]).cast<double>();
+    // An inward connector may be perpendicular to the outgoing offset edge.
+    // Rounded joins must not turn that right angle into a false backtrack.
+    return connector.dot(outgoing) < -4. * SCALED_EPSILON * outgoing.norm();
+}
+
+// Orca: sample the outgoing perimeter without copying or clipping its full loop.
+static Point sample_polyline_at_distance(const Polyline &polyline, double target)
+{
+    assert(! polyline.points.empty());
+    Point result = polyline.first_point();
+    for (size_t i = 1; i < polyline.points.size() && target > 0.; ++i) {
+        const Vec2d segment = (polyline.points[i] - result).cast<double>();
+        const double length = segment.norm();
+        if (length <= SCALED_EPSILON)
+            continue;
+        if (target <= length)
+            return (result.cast<double>() + segment * (target / length)).cast<coord_t>();
+        target -= length;
+        result = polyline.points[i];
+    }
+    return result;
+}
+
+// Orca: convert an executable path into Wipe::wipe()'s stored representation.
+// The first point is a dummy replaced by the actual nozzle position, while the
+// remaining points are clipped to the configured wipe distance.
+static bool store_wipe_path(Polyline &destination, Point seam_start,
+                            Polyline actual_path, double max_wipe_length)
+{
+    if (actual_path.points.size() < 2 || max_wipe_length <= SCALED_EPSILON)
+        return false;
+
+    const double actual_length = actual_path.length();
+    if (actual_length <= SCALED_EPSILON)
+        return false;
+    if (actual_length - max_wipe_length > SCALED_EPSILON)
+        actual_path.clip_end(actual_length - max_wipe_length);
+    if (actual_path.points.size() < 2)
+        return false;
+    for (size_t i = 1; i < actual_path.points.size(); ++i)
+        if (actual_path.points[i - 1] == actual_path.points[i])
+            return false;
+
+    Polyline stored_path;
+    stored_path.points.reserve(actual_path.points.size());
+    stored_path.points.push_back(seam_start);
+    stored_path.points.insert(stored_path.points.end(), actual_path.points.begin() + 1, actual_path.points.end());
+    stored_path.reset_to_linear_move();
+    destination = std::move(stored_path);
+    return true;
+}
+
+bool offset_wipe_path(Polyline &polyline, Point seam_start, Point seam_end, Point wipe_start,
+                      int dir, double offset_dist, double max_wipe_length)
+{
+    assert(dir == +1 || dir == -1);
+    assert(offset_dist > 0);
+    if (polyline.points.empty() || polyline.first_point() != seam_start ||
+        max_wipe_length <= SCALED_EPSILON)
+        return false;
+
+    const Polyline original = polyline;
+    const double original_length = original.length();
+    if (original_length <= SCALED_EPSILON)
+        return false;
+
+    double source_length = std::min(original_length, max_wipe_length);
+    for (;;) {
+        Polyline source = original;
+        const double clip_distance = original_length - source_length;
+        if (clip_distance > SCALED_EPSILON)
+            source.clip_end(clip_distance);
+
+        Points wrapped_source;
+        wrapped_source.reserve(source.points.size() + 1);
+        if (seam_start == seam_end) {
+            // Orca: the stored loop is open at seam_start even when the seam gap is
+            // zero. Prepend the closing edge so build_offset_polyline() creates
+            // the proper join between that edge and the first outgoing edge,
+            // instead of leaving the first offset point on the closing wall.
+            size_t closing_index = original.points.size();
+            while (closing_index > 0 && original.points[closing_index - 1] == seam_start)
+                --closing_index;
+            if (closing_index == 0)
+                return false; // Orca: the entire path is a single point.
+            wrapped_source.push_back(original.points[closing_index - 1]);
+        } else {
+            // Orca: use the unextruded seam-gap edge to determine the incoming
+            // direction at the seam. Its offset is construction geometry only;
+            // wiping along it would create a Z-shaped detour before the outgoing
+            // perimeter offset.
+            wrapped_source.push_back(seam_end);
+        }
+        wrapped_source.insert(wrapped_source.end(), source.points.begin(), source.points.end());
+
+        Points offset_points;
+        size_t first_join_index = 0;
+        if (! build_offset_polyline(wrapped_source, dir, offset_dist, offset_points, first_join_index) ||
+            first_join_index == 0 || first_join_index >= offset_points.size())
+            return false;
+        // Orca: discard the offset of the prepended edge and, for a bevel, its
+        // incoming endpoint. The executable wipe starts at the seam join and
+        // then follows only the already printed outgoing perimeter.
+        offset_points.erase(offset_points.begin(), offset_points.begin() + first_join_index);
+
+        Polyline actual_path;
+        actual_path.points.reserve(offset_points.size() + 1);
+        actual_path.points.push_back(wipe_start);
+        actual_path.points.insert(actual_path.points.end(), offset_points.begin(), offset_points.end());
+
+        // A loop pre-move may advance past an otherwise valid offset join.
+        // Enter at the nozzle's projection instead of returning to the join.
+        // Do not repair a join that already backtracks across the seam gap;
+        // the caller must still validate wall crossings, material side and support.
+        if (seam_start != seam_end && wipe_start != seam_start && wipe_start != seam_end &&
+            starts_by_backtracking(actual_path, wipe_start) && ! starts_by_backtracking(actual_path, seam_end)) {
+            size_t entry = 1;
+            while (entry + 1 < actual_path.points.size()) {
+                const Vec2d edge = (actual_path.points[entry + 1] - actual_path.points[entry]).cast<double>();
+                const double projection = (wipe_start - actual_path.points[entry]).cast<double>().dot(edge);
+                if (projection <= 0.)
+                    break;
+                if (projection < edge.squaredNorm()) {
+                    actual_path.points[entry] = (actual_path.points[entry].cast<double>() +
+                        edge * (projection / edge.squaredNorm())).cast<coord_t>();
+                    break;
+                }
+                ++entry;
+            }
+            actual_path.points.erase(actual_path.points.begin() + 1, actual_path.points.begin() + entry);
+        }
+
+        if (seam_start != seam_end && wipe_start == seam_end &&
+            starts_by_backtracking(actual_path, wipe_start)) {
+            // Orca: a wide seam gap or a sharp cusp may put the first miter
+            // behind its outgoing edge. Reject this offset candidate so the
+            // caller can try the opposite side or the translated fallback.
+            return false;
+        }
+
+        const double actual_length = actual_path.length();
+        const bool source_exhausted = original_length - source_length <= SCALED_EPSILON;
+        if (actual_length + SCALED_EPSILON < max_wipe_length && ! source_exhausted) {
+            // Orca: offset joins may shorten the path at every corner. Grow the
+            // source until the executable offset path, not a heuristic source
+            // margin, reaches the configured wipe distance.
+            const double deficit = max_wipe_length - actual_length;
+            const double next_length = std::min(original_length,
+                source_length + std::max(deficit, 2. * SCALED_EPSILON));
+            if (next_length - source_length <= SCALED_EPSILON)
+                return false;
+            source_length = next_length;
+            continue;
+        }
+
+        // Orca: unlike an extruded offset, a wipe may safely cross or retrace the
+        // just-printed perimeter. The caller validates the complete executable
+        // path against current and earlier printed perimeter geometry.
+        return store_wipe_path(polyline, seam_start, std::move(actual_path), max_wipe_length);
+    }
+}
+
+static bool translated_wipe_path(Polyline &polyline, Point seam_start, Point seam_end, Point wipe_start,
+                                 const Vec2d &translation, double max_wipe_length)
+{
+    if (translation.norm() <= SCALED_EPSILON || max_wipe_length <= SCALED_EPSILON)
+        return false;
+
+    const Polyline original = polyline;
+    Polyline actual_path;
+    actual_path.points.reserve(original.points.size() + 2);
+    actual_path.points.push_back(wipe_start);
+
+    const auto append_translated = [&actual_path, &translation](const Point &point) {
+        const Point translated = (point.cast<double>() + translation).cast<coord_t>();
+        if (translated != actual_path.points.back())
+            actual_path.points.push_back(translated);
+    };
+
+    // Orca: translate the seam join directly. Translating seam_end and then
+    // following the unextruded gap back to seam_start makes the wipe double
+    // back whenever a gap ends near a sharp corner.
+    append_translated(seam_start);
+    for (const Point &point : original.points)
+        append_translated(point);
+
+    if (seam_start != seam_end && wipe_start == seam_end &&
+        starts_by_backtracking(actual_path, wipe_start)) {
+        // Orca: at a wide gap next to a cusp, the translated seam join may
+        // lie behind the outgoing edge. Prefer a shorter local inward move
+        // at the actual extrusion end over a longer lightning-shaped wipe.
+        actual_path.points.resize(1);
+        append_translated(seam_end);
+    }
+
+    return store_wipe_path(polyline, seam_start, std::move(actual_path), max_wipe_length);
+}
+
+// A segment whose endpoints lie within one line's distance capsule is fully
+// supported, since that capsule is convex. Subdivide only when support changes
+// between lines; fixed-distance sampling can miss an unsupported gap.
+static bool segment_is_supported(Point start, Point end,
+                                  const AABBTreeLines::LinesDistancer<Line> &distancer,
+                                  double max_distance)
+{
+    const Point midpoint = ((start.cast<double>() + end.cast<double>()) * 0.5).cast<coord_t>();
+    const auto [distance, line_index, nearest] = distancer.distance_from_lines_extra<false>(midpoint);
+    if (distance > max_distance)
+        return false;
+
+    const Line &line = distancer.get_line(line_index);
+    if (line.distance_to(start) <= max_distance && line.distance_to(end) <= max_distance)
+        return true;
+    if (distancer.distance_from_lines<false>(start) > max_distance ||
+        distancer.distance_from_lines<false>(end) > max_distance)
+        return false;
+
+    // Conservatively reject an unresolved transition at coordinate precision.
+    if ((end - start).cast<double>().norm() <= SCALED_EPSILON)
+        return false;
+    return segment_is_supported(start, midpoint, distancer, max_distance) &&
+           segment_is_supported(midpoint, end, distancer, max_distance);
+}
+
+std::optional<double> wipe_path_support_score(
+    const Polyline &polyline, Point wipe_start,
+    const AABBTreeLines::LinesDistancer<Line> &target_distancer,
+    const AABBTreeLines::LinesDistancer<Line> &all_support_distancer,
+    double max_distance)
+{
+    if (polyline.points.size() < 2 || target_distancer.get_lines().empty() || max_distance <= 0)
+        return std::nullopt;
+
+    // Orca: require a local neighbour, not merely an earlier perimeter elsewhere in
+    // the region. At a convex corner, an inner wall's miter is farther from the
+    // external seam than its normal wall spacing, so allow the same bounded miter
+    // reach as the offset construction without accepting a remote island.
+    if (target_distancer.distance_from_lines<false>(wipe_start) >
+        miter_limit * max_distance + 4. * SCALED_EPSILON)
+        return std::nullopt;
+
+    Point previous = wipe_start;
+    for (size_t i = 1; i < polyline.points.size(); ++i) {
+        // Orca: a tightly curved inward path may cross back over the current wall.
+        // This is safe for a non-extruding wipe as long as the complete path
+        // remains over current or earlier printed perimeter geometry.
+        // Allow the same coordinate-rounding tolerance at every point, including
+        // the actual start substituted for the stored sentinel.
+        if (! segment_is_supported(previous, polyline.points[i], all_support_distancer,
+                                   max_distance + 4. * SCALED_EPSILON))
+            return std::nullopt;
+        previous = polyline.points[i];
+    }
+
+    // Orca: decide direction at the seam. Scoring the complete path may select
+    // the wrong initial side when two contours converge and the later prefix
+    // happens to run closer to unrelated support.
+    return target_distancer.distance_from_lines<false>(polyline.points[1]);
+}
+
+static bool initial_connector_is_clear(
+    const Polyline &polyline, Point wipe_start, Point seam_start,
+    AABBTreeLines::LinesDistancer<Line> &current_perimeter_distancer,
+    double contact_tolerance)
+{
+    if (polyline.points.size() < 2 || polyline.points[1] == wipe_start)
+        return false;
+
+    // Orca: without a seam gap, the connector necessarily starts at the wall
+    // and a self-touching cusp may share that same endpoint on several edges.
+    if (seam_start == wipe_start)
+        return true;
+
+    const Line connector(wipe_start, polyline.points[1]);
+    const auto intersections = current_perimeter_distancer.intersections_with_line<false>(connector);
+    for (const auto &intersection : intersections) {
+        if ((intersection.first - wipe_start).cast<double>().norm() > contact_tolerance)
+            return false;
+    }
+
+    Point closest;
+    // Orca: integer offset joins may miss the exact seam-start coordinate by
+    // a few microns. Treat a close pass through that point as retracing the
+    // external wall, but keep the unavoidable contact at the actual start.
+    if (connector.distance_to_squared(seam_start, &closest) <= contact_tolerance * contact_tolerance &&
+        (closest - wipe_start).cast<double>().norm() > contact_tolerance)
+        return false;
+
+    return true;
+}
+
+static std::optional<Vec2d> support_offset_at_start(
+    const Polyline &source, Point local_origin, bool disambiguate_branch,
+    AABBTreeLines::LinesDistancer<Line> &support_distancer,
+    double max_support_distance)
+{
+    if (source.points.size() < 2)
+        return std::nullopt;
+
+    // Orca: a nonzero gap may put the seam beside the wrong branch of a cusp.
+    // Sample farther along the path to identify its actual neighbouring wall.
+    const Point support_query = disambiguate_branch ?
+        sample_polyline_at_distance(source, 2. * max_support_distance) : source.first_point();
+    const auto nearest_result = support_distancer.distance_from_lines_extra<false>(support_query);
+    const Line &nearest_line = support_distancer.get_line(std::get<1>(nearest_result));
+    Vec2d sampled_offset = std::get<2>(nearest_result) - support_query.cast<double>();
+
+    if (disambiguate_branch) {
+        // Orca: an endpoint projection also contains distance along the support
+        // segment. Remove that tangent component before comparing wall sides.
+        const Vec2d support_edge = (nearest_line.b - nearest_line.a).cast<double>();
+        if (support_edge.norm() > SCALED_EPSILON) {
+            const Vec2d support_tangent = support_edge.normalized();
+            sampled_offset -= support_tangent * sampled_offset.dot(support_tangent);
+        }
+    }
+    if (sampled_offset.norm() <= SCALED_EPSILON)
+        return std::nullopt;
+
+    if (! disambiguate_branch)
+        return sampled_offset;
+
+    // Orca: find the local point on the same material-side branch. Using the
+    // sampled point itself would add the distance already travelled along the
+    // perimeter and turn a normal transition into a long diagonal move.
+    const Vec2d sampled_direction = sampled_offset.normalized();
+    Vec2d local_offset = sampled_offset;
+    double best_local_score = std::numeric_limits<double>::infinity();
+    for (size_t line_index : support_distancer.all_lines_in_radius(
+             local_origin, 2. * max_support_distance + 4. * SCALED_EPSILON)) {
+        Point local_support;
+        const Line &line = support_distancer.get_line(line_index);
+        const double distance_squared = line.distance_to_squared(local_origin, &local_support);
+        const Vec2d candidate_offset = local_support.cast<double>() - local_origin.cast<double>();
+        const double candidate_distance = std::sqrt(distance_squared);
+        if (candidate_distance <= SCALED_EPSILON)
+            continue;
+        const double alignment = candidate_offset.normalized().dot(sampled_direction);
+        if (alignment < min_support_alignment)
+            continue;
+        const double score = candidate_distance / alignment;
+        if (score < best_local_score) {
+            best_local_score = score;
+            local_offset = candidate_offset;
+        }
+    }
+    return local_offset;
+}
+
+static double executable_path_length(const Polyline &stored_path, Point wipe_start)
+{
+    if (stored_path.points.size() < 2)
+        return 0.;
+
+    // Orca: points[0] is the storage sentinel, so measure the first segment
+    // from the actual nozzle position and the remaining stored segments normally.
+    double length = (stored_path.points[1] - wipe_start).cast<double>().norm();
+    for (size_t index = 2; index < stored_path.points.size(); ++index)
+        length += (stored_path.points[index] - stored_path.points[index - 1]).cast<double>().norm();
+    return length;
+}
+
+static Lines material_side_support_lines(const Polyline &path, Point seam, int preferred_dir,
+                                         const Lines &support_lines)
+{
+    if (path.points.size() < 4 || path.first_point() != path.last_point())
+        return {};
+
+    // Orca: the bisector of the incoming and outgoing material-side normals is
+    // a local side test that remains valid for globally self-touching Arachne
+    // contours. Ignore repeated seam points when obtaining both tangents.
+    const auto outgoing_it = std::find_if(
+        path.points.begin() + 1, path.points.end(), [seam](const Point &point) { return point != seam; });
+    const auto incoming_it = std::find_if(
+        path.points.rbegin() + 1, path.points.rend(), [seam](const Point &point) { return point != seam; });
+    if (outgoing_it == path.points.end() || incoming_it == path.points.rend())
+        return {};
+
+    const Vec2d outgoing = (*outgoing_it - seam).cast<double>().normalized();
+    const Vec2d incoming = (seam - *incoming_it).cast<double>().normalized();
+    const Vec2d material_direction =
+        (Vec2d(-outgoing.y(), outgoing.x()) + Vec2d(-incoming.y(), incoming.x())) * preferred_dir;
+    if (material_direction.norm() <= EPSILON)
+        return {};
+
+    Lines result;
+    result.reserve(support_lines.size());
+    for (const Line &line : support_lines) {
+        Point closest;
+        line.distance_to_squared(seam, &closest);
+        if ((closest - seam).cast<double>().dot(material_direction) > SCALED_EPSILON)
+            result.push_back(line);
+    }
+    return result;
+}
+
+bool wipe_path_stays_on_material_side(
+    const Polyline &path, Point path_start, const Vec2d &support_direction,
+    const AABBTreeLines::LinesDistancer<Line> &target_perimeter_distancer,
+    const AABBTreeLines::LinesDistancer<Line> &current_perimeter_distancer,
+    double effective_offset, bool require_clearance)
+{
+    if (path.points.size() < 2 || support_direction.norm() <= EPSILON ||
+        target_perimeter_distancer.get_lines().empty() || current_perimeter_distancer.get_lines().empty() ||
+        effective_offset <= SCALED_EPSILON)
+        return false;
+
+    const Vec2d initial_offset = (path.points[1] - path_start).cast<double>();
+    if (initial_offset.norm() <= SCALED_EPSILON ||
+        initial_offset.normalized().dot(support_direction.normalized()) < min_support_alignment)
+        return false;
+    // Orca: after the connector has left the extrusion endpoint, an inward
+    // offset must retain most of its requested clearance from the current
+    // external wall. Otherwise a tight turn may send an initially correct path
+    // back onto that wall, or make the opposite-side candidate look supported.
+    const double clearance_tolerance = wipe_tolerance(effective_offset, 0.25);
+    const double minimum_clearance = effective_offset - clearance_tolerance;
+    const Lines &lines = current_perimeter_distancer.get_lines();
+    const auto left_normal = [](const Line &line) -> Vec2d {
+        const Vec2d edge = (line.b - line.a).cast<double>();
+        if (edge.norm() <= SCALED_EPSILON)
+            return Vec2d::Zero();
+        return Vec2d(-edge.y(), edge.x()).normalized();
+    };
+    const auto on_material_side = [&](const Point &point, bool check_clearance) {
+        const auto [distance, line_index, nearest] =
+            current_perimeter_distancer.distance_from_lines_extra<false>(point);
+        if (line_index >= lines.size())
+            return false;
+        const Line &line = lines[line_index];
+        Vec2d normal = left_normal(line);
+        // At a shared vertex use both incident edges, so the result does not
+        // depend on which equally close edge the AABB query happens to return.
+        const Line &previous = lines[(line_index + lines.size() - 1) % lines.size()];
+        const Line &next = lines[(line_index + 1) % lines.size()];
+        if ((nearest - line.a.cast<double>()).norm() <= SCALED_EPSILON && previous.b == line.a)
+            normal += left_normal(previous);
+        if ((nearest - line.b.cast<double>()).norm() <= SCALED_EPSILON && next.a == line.b)
+            normal += left_normal(next);
+        if (normal.norm() <= EPSILON)
+            return false;
+
+        // An open or self-touching wall has no reliable polygon-wide sign.
+        // Orient its local normal toward the neighbouring printed inner wall,
+        // then test the candidate on that side at every sample.
+        normal.normalize();
+        const Point wall_point = nearest.cast<coord_t>();
+        const Vec2d support_point = std::get<2>(
+            target_perimeter_distancer.distance_from_lines_extra<false>(wall_point));
+        const double support_side = (support_point - nearest).dot(normal);
+        if (std::abs(support_side) <= 4. * SCALED_EPSILON)
+            return false;
+        const double side = (point.cast<double>() - nearest).dot(normal) * (support_side > 0. ? 1. : -1.);
+        return side >= -4. * SCALED_EPSILON &&
+            (! check_clearance || distance + 4. * SCALED_EPSILON >= minimum_clearance);
+    };
+
+    Point previous = path.points[1];
+    if (! on_material_side(previous, require_clearance))
+        return false;
+    for (size_t index = 2; index < path.points.size(); ++index) {
+        const Vec2d segment = (path.points[index] - previous).cast<double>();
+        const size_t samples = std::max<size_t>(1, size_t(std::ceil(segment.norm() / effective_offset)));
+        for (size_t sample = 1; sample <= samples; ++sample) {
+            const Point point = (previous.cast<double>() +
+                segment * (double(sample) / double(samples))).cast<coord_t>();
+            if (! on_material_side(point, require_clearance))
+                return false;
+        }
+        previous = path.points[index];
+    }
+    return true;
+}
+
+bool offset_wipe_path_toward_support(Polyline &polyline, Point seam_start, Point seam_end, Point wipe_start,
+                                     int preferred_dir, double offset_dist, double max_wipe_length,
+                                     const Lines &target_perimeter_lines, const Lines &printed_perimeter_lines,
+                                     const Lines &current_perimeter_lines,
+                                     double max_support_distance)
+{
+    assert(preferred_dir == +1 || preferred_dir == -1);
+    if (polyline.points.size() < 2 || target_perimeter_lines.empty() || current_perimeter_lines.empty() ||
+        offset_dist <= SCALED_EPSILON ||
+        max_wipe_length <= SCALED_EPSILON || max_support_distance <= SCALED_EPSILON)
+        return false;
+
+    Lines material_support_lines;
+    const Lines *candidate_support_lines = &target_perimeter_lines;
+    if (seam_start == seam_end) {
+        // Orca: another contour may have a geometrically closer inner wall on
+        // this loop's air side. Restrict zero-gap support using the local seam
+        // normals before choosing the nearest wall.
+        material_support_lines = material_side_support_lines(
+            polyline, seam_start, preferred_dir, target_perimeter_lines);
+        if (material_support_lines.empty())
+            return false;
+        candidate_support_lines = &material_support_lines;
+    }
+
+    AABBTreeLines::LinesDistancer<Line> support_distancer(*candidate_support_lines);
+    const std::optional<Vec2d> support_offset = support_offset_at_start(
+        polyline, seam_end, seam_start != seam_end,
+        support_distancer, max_support_distance);
+    if (! support_offset)
+        return false;
+    const Vec2d toward_support = *support_offset;
+    const double local_support_distance = toward_support.norm();
+    const double effective_offset = std::min(offset_dist, local_support_distance);
+    if (effective_offset <= SCALED_EPSILON)
+        return false;
+    const Vec2d support_direction = toward_support / local_support_distance;
+
+    // Orca: every candidate is validated against the same generated geometry.
+    // Build these AABB trees once per loop instead of rebuilding them for each
+    // preferred, alternate, translated, direct, or reversed candidate.
+    Lines all_support_lines = printed_perimeter_lines;
+    all_support_lines.insert(all_support_lines.end(), current_perimeter_lines.begin(), current_perimeter_lines.end());
+    AABBTreeLines::LinesDistancer<Line> all_support_distancer(std::move(all_support_lines));
+    AABBTreeLines::LinesDistancer<Line> current_perimeter_distancer(current_perimeter_lines);
+
+    // Orca: allow only the contact needed to leave the extrusion endpoint. A
+    // connector that meets the current wall again is a seam-gap retrace, even
+    // if the rest of the non-extruding wipe remains over printed material.
+    const double contact_tolerance = wipe_tolerance(effective_offset);
+
+    struct Candidate {
+        Polyline path;
+        // Orca: support score chooses the material-side path; length is used
+        // only to replace a corner-truncated path with the reverse fallback.
+        double support_score;
+        double path_length;
+    };
+
+    // Direction and wall contact have different origins after a loop pre-move.
+    // Keep the construction's wall endpoint for intersection checks even when
+    // the candidate's direction must be checked from the current nozzle position.
+    const auto validate_candidate = [&](Polyline path, Point path_start, Point direction_start,
+                                        double path_contact_tolerance,
+                                        const Vec2d &candidate_support_direction,
+                                        double candidate_offset,
+                                        bool require_clearance = true) -> std::optional<Candidate> {
+        // Orca: backtracking indicates a wrong join only across a nonzero gap.
+        // A closed zero-gap offset may initially turn back at its miter while
+        // still remaining on the supported material side of the perimeter.
+        const bool backtracks_across_gap = seam_start != seam_end && starts_by_backtracking(path, wipe_start);
+        // At a clipped corner another branch of the current wall may be closer
+        // than the requested offset. Preserve the zero-gap clearance rule, but
+        // check direction and local material side independently for every gap.
+        const bool material_side = wipe_path_stays_on_material_side(
+            path, direction_start, candidate_support_direction,
+            support_distancer, current_perimeter_distancer, candidate_offset,
+            require_clearance && seam_start == seam_end);
+        const bool connector_clear = initial_connector_is_clear(
+            path, wipe_start, path_start, current_perimeter_distancer, path_contact_tolerance);
+        if (backtracks_across_gap || ! material_side || ! connector_clear)
+            return std::nullopt;
+        const std::optional<double> score = wipe_path_support_score(
+            path, wipe_start, support_distancer, all_support_distancer, max_support_distance);
+        if (! score)
+            return std::nullopt;
+        const double path_length = executable_path_length(path, wipe_start);
+        return Candidate{std::move(path), *score, path_length};
+    };
+
+    const auto offset_candidate = [&](int dir) -> std::optional<Candidate> {
+        Polyline path = polyline;
+        if (! offset_wipe_path(path, seam_start, seam_end, wipe_start, dir,
+                               effective_offset, max_wipe_length))
+            return std::nullopt;
+        return validate_candidate(std::move(path), seam_start, seam_start,
+                                  contact_tolerance, support_direction, effective_offset);
+    };
+
+    std::optional<Candidate> preferred = offset_candidate(preferred_dir);
+    std::optional<Candidate> alternate = offset_candidate(-preferred_dir);
+
+    // Orca: forward and reverse fallbacks share the same clamping, translation,
+    // connector tolerance, and complete-path validation.
+    const auto translated_candidate = [&](Polyline source, Point source_start, Point source_end,
+                                          const Vec2d &candidate_support_offset) -> std::optional<Candidate> {
+        const double support_distance = candidate_support_offset.norm();
+        const double candidate_offset = std::min(offset_dist, support_distance);
+        if (candidate_offset <= SCALED_EPSILON)
+            return std::nullopt;
+
+        const Vec2d candidate_translation = candidate_support_offset * (candidate_offset / support_distance);
+        if (! translated_wipe_path(source, source_start, source_end, wipe_start,
+                                   candidate_translation, max_wipe_length))
+            return std::nullopt;
+        const double candidate_tolerance = wipe_tolerance(candidate_offset);
+        return validate_candidate(std::move(source), source_start, source_start, candidate_tolerance,
+                                  candidate_support_offset / support_distance, candidate_offset);
+    };
+
+    std::optional<Candidate> translated = translated_candidate(polyline, seam_start, seam_end, toward_support);
+
+    // Orca: if every full-length construction folds back onto the external
+    // wall, retain a short direct inward move instead of accepting an outward
+    // candidate or falling back to the standard wipe along the outer wall.
+    const auto direct_candidate = [&](Point origin, const Vec2d &candidate_support_offset) -> std::optional<Candidate> {
+        const double support_distance = candidate_support_offset.norm();
+        const double candidate_offset = std::min(offset_dist, support_distance);
+        if (candidate_offset <= SCALED_EPSILON)
+            return std::nullopt;
+        const Vec2d direction = candidate_support_offset / support_distance;
+        const Point destination = (origin.cast<double>() + direction * candidate_offset).cast<coord_t>();
+        if (destination == wipe_start)
+            return std::nullopt;
+
+        Polyline path;
+        if (! store_wipe_path(path, seam_start, Polyline{wipe_start, destination}, max_wipe_length))
+            return std::nullopt;
+        const double candidate_tolerance = wipe_tolerance(candidate_offset);
+        // Check the executed direction from the nozzle after any loop pre-move,
+        // but retain the wall origin for the connector's intersection checks.
+        return validate_candidate(std::move(path), origin, wipe_start,
+                                  candidate_tolerance, direction, candidate_offset, false);
+    };
+    std::optional<Candidate> direct = direct_candidate(seam_end, toward_support);
+
+    const double length_margin = wipe_tolerance(max_wipe_length);
+    std::optional<Candidate> reversed;
+    if (seam_start != seam_end && polyline.last_point() == seam_end) {
+        // Orca: when a large gap straddles a sharp corner, connecting the
+        // extrusion end to the forward offset may either reverse or leave only
+        // a short local move. The already printed incoming wall is equally safe:
+        // follow it backwards and determine its own material-side support.
+        Polyline reversed_source = polyline;
+        reversed_source.reverse();
+        const std::optional<Vec2d> reversed_support_offset = support_offset_at_start(
+            reversed_source, seam_end, true, support_distancer, max_support_distance);
+        if (reversed_support_offset) {
+            reversed = translated_candidate(reversed_source, seam_end, seam_end, *reversed_support_offset);
+            // A translated reverse path can backtrack or leave the material on
+            // a curved wall. Offset the incoming wall itself when translation
+            // cannot supply a complete wipe, retaining all candidate checks.
+            if (! reversed || reversed->path_length + length_margin < max_wipe_length) {
+                const double reverse_offset = std::min(offset_dist, reversed_support_offset->norm());
+                if (reverse_offset > SCALED_EPSILON &&
+                    offset_wipe_path(reversed_source, seam_end, seam_start, wipe_start,
+                                     -preferred_dir, reverse_offset, max_wipe_length)) {
+                    reversed_source.points.front() = seam_start;
+                    auto candidate = validate_candidate(std::move(reversed_source), seam_end, seam_end,
+                        wipe_tolerance(reverse_offset), reversed_support_offset->normalized(), reverse_offset);
+                    if (candidate && (! reversed ||
+                        (candidate->path_length > reversed->path_length + length_margin &&
+                         candidate->support_score <= reversed->support_score + wipe_tolerance(reverse_offset))))
+                        reversed = std::move(candidate);
+                }
+            }
+        }
+    }
+
+    // Orca: conventional offsets at a narrow cusp may form a bevel across the
+    // cusp. Candidates pointing away from the actual inner wall are rejected
+    // during validation; among the remaining paths, prefer the one whose first
+    // point is materially closer to that wall.
+    const double direction_change_margin = wipe_tolerance(effective_offset);
+    std::optional<Candidate> selected = std::move(preferred);
+    if (translated) {
+        if (! selected || translated->support_score + direction_change_margin < selected->support_score)
+            selected = std::move(translated);
+    }
+    if (! selected)
+        selected = std::move(direct);
+    // Prefer a direct inward move when the normal offset cannot be used.
+    // An alternate offset is eligible only after the same material-side checks.
+    if (! selected)
+        selected = std::move(alternate);
+
+    // Orca: prefer a complete reverse wipe over a forward fallback that had to
+    // stop at the corner. Equal-length paths keep the normal forward behavior.
+    if (reversed && (! selected ||
+        (reversed->path_length > selected->path_length + length_margin &&
+         reversed->support_score <= selected->support_score + direction_change_margin)))
+        selected = std::move(reversed);
+    if (! selected)
+        return false;
+
+    polyline = std::move(selected->path);
+    return true;
+}
+
+std::optional<Point> wipe_on_loops_destination(const ExtrusionPaths &paths, double nozzle_diam_scaled,
+                                                 bool is_ccw, bool is_hole)
+{
+    assert(!paths.empty());
+    assert(nozzle_diam_scaled > 0);
+    if (paths.empty() || nozzle_diam_scaled <= 0)
+        return std::nullopt;
+
+    // Orca: clamp sample distance to L/4 so forward/backward samples cannot meet.
+    double total_length = 0.;
+    for (const ExtrusionPath &path : paths)
+        total_length += path.length();
+    const double sample_distance = std::min(nozzle_diam_scaled, total_length * 0.25);
+
+    Point a = sample_path_at_distance(paths, true,  sample_distance);
+    Point b = sample_path_at_distance(paths, false, sample_distance);
+
+    const Point seam_start = paths.front().first_point();
+
+    // Orca: skip the inward move for degenerate geometry.
+    if (a == b || a == seam_start || b == seam_start)
+        return std::nullopt;
+
+    const bool reverse_turn = is_hole == is_ccw;
+    if (reverse_turn)
+        std::swap(a, b);
+
+    double angle = seam_start.ccw_angle(a, b) / 3;
+
+    // Orca: reject degenerate angles near 0 or 2π.
+    static constexpr double angle_epsilon = 0.01;
+    if (angle < angle_epsilon || angle > 2 * PI / 3 - angle_epsilon)
+        return std::nullopt;
+
+    if (reverse_turn)
+        angle *= -1;
+
+    Point pt = sample_path_at_distance(paths, true, std::min(0.2 * nozzle_diam_scaled, sample_distance));
+    pt.rotate(angle, seam_start);
+    return pt;
+}
+
+} // namespace Slic3r

src/libslic3r/GCode/WipePathHelpers.hpp

@@ -0,0 +1,96 @@
+#pragma once
+
+#include <optional>
+
+#include "../ExtrusionEntity.hpp"
+#include "../Polyline.hpp"
+#include "../Line.hpp"
+
+namespace Slic3r {
+
+// Printed prefix of one region's perimeter sequence. Append each entity only
+// after extrusion; later walls and other regions cannot support an inward wipe.
+struct WipeInwardSupport {
+    Lines printed_lines;
+    Lines inner_lines;
+    void append(const ExtrusionEntity &entity);
+};
+
+namespace AABBTreeLines {
+template <typename LineType> class LinesDistancer;
+}
+
+// Orca: sample a point at a given distance along ExtrusionPaths, walking
+// across segment boundaries. forward=true walks from paths.front, false from
+// paths.back. For tiny loops the walk stops early and returns the last
+// reachable point. Returns the start point if target is zero.
+// Precondition: paths must be non-empty.
+Point sample_path_at_distance(const ExtrusionPaths &paths, bool forward, double target);
+
+// Orca: return the side of the printed path on which the material lies.
+// dir +1 is left and -1 is right, matching the offset-builder convention.
+int wipe_offset_direction(bool is_ccw, bool is_hole);
+
+// Orca: atomically offset a stored wipe path. The seam-gap or closing edge
+// determines the join with the first outgoing perimeter edge, but its offset
+// is not part of the executable wipe. Only the prefix needed by Wipe::wipe()
+// is offset. Returns false and leaves polyline unchanged if that path cannot
+// be constructed without degenerate segments. This only constructs a candidate;
+// offset_wipe_path_toward_support() validates its support, material side and
+// connector before accepting it. The first stored point
+// remains a dummy preserving Wipe::wipe()'s convention of skipping points[0].
+// Precondition: polyline starts at seam_start, dir is +1 or -1, and
+// offset_dist > 0. A non-positive max_wipe_length returns false.
+bool offset_wipe_path(Polyline &polyline, Point seam_start, Point seam_end, Point wipe_start,
+                      int dir, double offset_dist, double max_wipe_length);
+
+// Orca: score a candidate's first destination by distance to the target inner
+// walls. Return nullopt if no target wall is near wipe_start or any executable
+// segment lacks support. target_distancer contains eligible earlier walls;
+// all_support_distancer includes the current wall and all earlier walls.
+// The stored first point is a dummy: the first segment starts at wipe_start.
+// This checks support only; material-side and connector checks belong to
+// offset_wipe_path_toward_support(). Trees are reused across its candidates.
+std::optional<double> wipe_path_support_score(
+    const Polyline &polyline, Point wipe_start,
+    const AABBTreeLines::LinesDistancer<Line> &target_distancer,
+    const AABBTreeLines::LinesDistancer<Line> &all_support_distancer,
+    double max_distance);
+
+// Validate the initial inward direction and the local material side along the
+// executable path, using the inner wall to orient the open current wall's
+// normals. Clearance is optional for clipped corners and short direct fallbacks;
+// the material-side check is mandatory. The straight connector is checked by
+// its initial direction and separately by support and intersection validation.
+// path_start is the construction origin; points[0] is only a storage sentinel.
+bool wipe_path_stays_on_material_side(
+    const Polyline &path, Point path_start, const Vec2d &support_direction,
+    const AABBTreeLines::LinesDistancer<Line> &target_perimeter_distancer,
+    const AABBTreeLines::LinesDistancer<Line> &current_perimeter_distancer,
+    double effective_offset, bool require_clearance);
+
+// Orca: identify the adjacent inner perimeter from the outgoing wall, excluding
+// support on the air side of a closed zero-gap loop. Clamp the requested offset
+// to the distance from the seam end to that support, then select the safest
+// supported offset or translated path. If a wide seam gap at a corner truncates
+// every forward candidate, the incoming printed wall may be followed backwards
+// instead. All earlier printed perimeters still participate in the complete-path
+// safety check. This handles converging, locally ambiguous, or self-touching
+// contours whose global winding alone does not identify the material side.
+// Returns false and leaves polyline unchanged when no candidate is supported.
+// Precondition: preferred_dir is +1 or -1. Distances must be positive.
+bool offset_wipe_path_toward_support(Polyline &polyline, Point seam_start, Point seam_end, Point wipe_start,
+                                     int preferred_dir, double offset_dist, double max_wipe_length,
+                                     const Lines &target_perimeter_lines, const Lines &printed_perimeter_lines,
+                                     const Lines &current_perimeter_lines,
+                                     double max_support_distance);
+
+// Orca: compute the inward destination point for wipe_on_loops, or
+// std::nullopt when the geometry is degenerate (tiny loop, coincident samples,
+// angle near 0 or 2π). Returns the rotated destination or nullopt to skip the
+// inward move entirely.
+// Precondition: paths non-empty, nozzle_diam_scaled > 0.
+std::optional<Point> wipe_on_loops_destination(const ExtrusionPaths &paths, double nozzle_diam_scaled,
+                                                 bool is_ccw, bool is_hole);
+
+} // namespace Slic3r

src/libslic3r/GCode/WipeTower.cpp

@@ -1349,7 +1349,7 @@ public:
             // flavor it reaches understands, not the zero dwell the other flavors flush with.
             buffer += "M400\n";
         buffer += "M104";
-        if (target_extruder != -1)
+        if (target_extruder != -1 && target_extruder < int(m_physical_extruder_map.size()))
             buffer += (" T" + std::to_string(m_physical_extruder_map[target_extruder]));
         buffer += " S" + std::to_string(target_temp) + " N0"; // N0 means the gcode is generated by slicer
         if (!comment.empty()) buffer += " ;" + comment;
@@ -1361,7 +1361,7 @@ public:
     WipeTowerWriter &format_line_M109(int target_temp, int target_extruder, const std::string &comment = std::string())
     {
         std::string buffer = "M109";
-        if (target_extruder != -1)
+        if (target_extruder != -1 && target_extruder < int(m_physical_extruder_map.size()))
             buffer += (" T" + std::to_string(m_physical_extruder_map[target_extruder]));
         buffer += " S" + std::to_string(target_temp) + " N0"; // N0 means the gcode is generated by slicer
         if (!comment.empty()) buffer += " ;" + comment;
@@ -3309,7 +3309,7 @@ void WipeTower::get_wall_skip_points(const WipeTowerInfo &layer, int layer_id)
         if (!cur_block_depth.count(m_filpar[new_filament].category)) cur_block_depth[m_filpar[new_filament].category] = block->start_depth;
         process_depth = cur_block_depth[m_filpar[new_filament].category];
         if (is_need_ramming(new_filament, old_filament, layer_id)) {
-            if (m_filament_categories[new_filament] == m_filament_categories[old_filament])
+            if (get_filament_category(new_filament) == get_filament_category(old_filament))
                 process_depth += nozzle_change_depth;
             else {
                 if (!cur_block_depth.count(m_filpar[old_filament].category)) {
@@ -4783,7 +4783,7 @@ int WipeTower::get_wall_filament_for_all_layer()
     int filament_id    = -1;
     int filament_count = 0;
     for (auto iter = filament_counts.begin(); iter != filament_counts.end(); ++iter) {
-        if (m_filament_categories[iter->first] == selected_category && iter->second > filament_count) {
+        if (get_filament_category(iter->first) == selected_category && iter->second > filament_count) {
             filament_id    = iter->first;
             filament_count = iter->second;
         }

src/libslic3r/Layer.hpp

@@ -16,6 +16,7 @@ using LayerPtrs = std::vector<Layer*>;
 class LayerRegion;
 using LayerRegionPtrs = std::vector<LayerRegion*>;
 class PrintRegion;
+class PrintRegionConfig;
 class PrintObject;
 class Print;
 
@@ -200,6 +201,11 @@ public:
                                                                            FillAdaptive::Octree *support_fill_octree,
                                                                            FillLightning::Generator* lightning_generator) const;
     void 					make_ironing();
+    // Returns the filament id (1-based) the region is ironed with, or -1 when the
+    // region is not ironed.
+    static int              choose_ironing_extruder(const PrintRegionConfig &cfg,
+                                                    bool spiral_mode,
+                                                    bool is_topmost_layer);
     void                    make_contour_z(const sla::IndexedMesh &mesh);
 
     void                    export_region_slices_to_svg(const char *path) const;

src/libslic3r/Preset.cpp

@@ -1282,6 +1282,8 @@ static std::vector<std::string> s_Preset_print_options{
     "accel_to_decel_enable",
     "accel_to_decel_factor",
     "wipe_on_loops",
+    "wipe_inward",
+    "wipe_inward_distance",
     "wipe_before_external_loop",
     "bridge_density",
     "internal_bridge_density",

src/libslic3r/PresetBundle.cpp

@@ -484,7 +484,7 @@ bool PresetBundle::resolve_preset_config(DynamicPrintConfig &config, Preset::Typ
     else if (compatibility_rule == ForwardCompatibilitySubstitutionRule::EnableSilentDisableSystem)
         compatibility_rule = ForwardCompatibilitySubstitutionRule::Disable;
 
-    auto collection_for_type = [](PresetBundle &bundle, Preset::Type preset_type) -> PresetCollection * {
+    auto collection_for_type = [](const PresetBundle &bundle, Preset::Type preset_type) -> const PresetCollection * {
         switch (preset_type) {
         case Preset::TYPE_PRINT:    return &bundle.prints;
         case Preset::TYPE_FILAMENT: return &bundle.filaments;
@@ -493,15 +493,15 @@ bool PresetBundle::resolve_preset_config(DynamicPrintConfig &config, Preset::Typ
         }
     };
 
-    PresetCollection *collection = collection_for_type(*this, type);
+    const PresetCollection *collection = collection_for_type(*this, type);
     if (collection == nullptr) {
         error = "Unsupported preset type";
         return false;
     }
 
     const boost::filesystem::path source_path = boost::filesystem::absolute(source_file).lexically_normal();
-    auto find_loaded = [&](PresetBundle &bundle) -> const Preset * {
-        PresetCollection *loaded_collection = collection_for_type(bundle, type);
+    auto find_loaded = [&](const PresetBundle &bundle) -> const Preset * {
+        const PresetCollection *loaded_collection = collection_for_type(bundle, type);
         const Preset *resolved = nullptr;
         for (const Preset &preset : loaded_collection->get_presets()) {
             if (preset.file.empty())
@@ -549,30 +549,11 @@ bool PresetBundle::resolve_preset_config(DynamicPrintConfig &config, Preset::Typ
             continue;
 
         try {
-            PresetBundle library_bundle;
-            const PresetBundle *base_bundle = nullptr;
-            if (vendor_id != ORCA_FILAMENT_LIBRARY &&
-                boost::filesystem::is_regular_file(root_dir / (std::string(ORCA_FILAMENT_LIBRARY) + ".json"))) {
-                library_bundle.m_preserve_vendor_source_paths = true;
-                library_bundle.load_vendor_configs_from_json(root_dir.string(), ORCA_FILAMENT_LIBRARY, LoadSystem,
-                                                             compatibility_rule, nullptr, false);
-                if (library_bundle.error_count() != 0) {
-                    error = "OrcaFilamentLibrary contains invalid presets";
-                    return false;
-                }
-                base_bundle = &library_bundle;
-            }
-
-            PresetBundle source_bundle;
-            source_bundle.m_preserve_vendor_source_paths = true;
-            source_bundle.load_vendor_configs_from_json(root_dir.string(), vendor_id, LoadSystem,
-                                                        compatibility_rule, base_bundle, false);
-            if (source_bundle.error_count() != 0) {
-                error = "Vendor bundle contains invalid presets";
+            const PresetBundle *loaded = load_source_vendor(root_dir, vendor_id, compatibility_rule, error);
+            if (loaded == nullptr)
                 return false;
-            }
 
-            const Preset *resolved = find_loaded(source_bundle);
+            const Preset *resolved = find_loaded(*loaded);
             if (resolved == nullptr) {
                 if (error.empty())
                     error = "Source file is not an instantiated preset in its vendor manifest";
@@ -591,6 +572,37 @@ bool PresetBundle::resolve_preset_config(DynamicPrintConfig &config, Preset::Typ
     return false;
 }
 
+const PresetBundle *PresetBundle::load_source_vendor(const boost::filesystem::path &root_dir,
+                                                    const std::string &vendor_id,
+                                                    ForwardCompatibilitySubstitutionRule compatibility_rule,
+                                                    std::string &error)
+{
+    auto key = std::make_tuple(root_dir.string(), vendor_id, compatibility_rule);
+    if (auto it = m_source_vendor_bundles.find(key); it != m_source_vendor_bundles.end())
+        return it->second.get();
+
+    // The library loads with no base of its own, so the tree a vendor inherits from
+    // is the same one that resolves the library's own presets.
+    const PresetBundle *library = nullptr;
+    if (vendor_id != ORCA_FILAMENT_LIBRARY &&
+        boost::filesystem::is_regular_file(root_dir / (std::string(ORCA_FILAMENT_LIBRARY) + ".json"))) {
+        library = load_source_vendor(root_dir, ORCA_FILAMENT_LIBRARY, compatibility_rule, error);
+        if (library == nullptr) {
+            error = "OrcaFilamentLibrary contains invalid presets";
+            return nullptr;
+        }
+    }
+
+    auto bundle = std::make_unique<PresetBundle>();
+    bundle->m_preserve_vendor_source_paths = true;
+    bundle->load_vendor_configs_from_json(root_dir.string(), vendor_id, LoadSystem, compatibility_rule, library, false);
+    if (bundle->error_count() != 0) {
+        error = "Vendor bundle contains invalid presets";
+        return nullptr;
+    }
+    return m_source_vendor_bundles.emplace(std::move(key), std::move(bundle)).first->second.get();
+}
+
 bool PresetBundle::resolve_preset_config_type(DynamicPrintConfig &config, Preset::Type &type,
                                               const std::string &source_file,
                                               ForwardCompatibilitySubstitutionRule compatibility_rule,

src/libslic3r/PresetBundle.hpp

@@ -11,6 +11,7 @@
 #include <map>
 #include <set>
 #include <shared_mutex>
+#include <tuple>
 #include <unordered_map>
 #include <optional>
 #include <array>
@@ -652,6 +653,17 @@ private:
     bool m_generate_vendor_caches { false };
     bool m_preserve_vendor_source_paths { false };
 
+    // Vendor trees loaded by resolve_preset_config's manifest path, so every preset
+    // resolved through this bundle shares one load per source root and vendor. The
+    // filament library is one such tree, shared by every vendor under its root.
+    std::map<std::tuple<std::string, std::string, ForwardCompatibilitySubstitutionRule>, std::unique_ptr<PresetBundle>>
+        m_source_vendor_bundles;
+
+    const PresetBundle *load_source_vendor(const boost::filesystem::path &root_dir,
+                                           const std::string &vendor_id,
+                                           ForwardCompatibilitySubstitutionRule compatibility_rule,
+                                           std::string &error);
+
     // Orca: validation only - flag any printer with two or more compatible
     // filament presets sharing one filament_id (ambiguous AMS subtype match).
     bool check_duplicate_filament_subtypes() const;

src/libslic3r/Print.cpp

@@ -233,6 +233,8 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n
         "accel_to_decel_enable",
         "accel_to_decel_factor",
         "wipe_on_loops",
+        "wipe_inward",
+        "wipe_inward_distance",
         "gcode_comments",
         "gcode_label_objects", 
         "exclude_object",

src/libslic3r/PrintConfig.cpp

@@ -6267,6 +6267,35 @@ void PrintConfigDef::init_fff_params()
     def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionBool(false));
 
+    def = this->add("wipe_inward", coBool);
+    def->label = L("Wipe inward");
+    def->category = L("Quality");
+    def->tooltip = L("Applies only to external walls, including hole boundaries. Moves the hot nozzle toward printed "
+                     "inner walls during wiping to reduce reheating of freshly printed plastic and seam marks.\n\n"
+                     "Especially useful at layer heights below 0.1 mm, where wipe marks are more visible.\n\n"
+                     "Uses the regular wipe if no adjacent inner wall is already printed (single-wall areas or "
+                     "Outer/Inner wall order), or if no supported inward path can be found, for example at tight "
+                     "corners or seam gaps.");
+    def->mode = comExpert;
+    def->set_default_value(new ConfigOptionBool(false));
+
+    def = this->add("wipe_inward_distance", coFloatOrPercent);
+    def->label = L("Wipe inward distance");
+    def->category = L("Quality");
+    def->tooltip = L("The distance the wipe path is shifted away from the external perimeter, specified in millimeters "
+                     "or as a percentage of the actual outer-wall extrusion width.\n\n"
+                     "For example, 50% shifts the path by half of the outer-wall width. The effective offset is limited "
+                     "by both the actual outer-wall width and the available spacing to the adjacent wall, so values "
+                     "above 100% or an equivalent absolute distance have no additional effect. "
+                     "Set to 0 to disable the offset.");
+    def->sidetext = L("mm or %");
+    def->ratio_over = "outer_wall_line_width";
+    def->min = 0;
+    def->max = 100;
+    def->max_literal = 2; // Orca: G-code generation also clamps literal values to the actual outer-wall width.
+    def->mode = comExpert;
+    def->set_default_value(new ConfigOptionFloatOrPercent(50, true));
+
     def = this->add("wipe_before_external_loop", coBool);
     def->label = L("Wipe before external loop");
     def->category = L("Quality");
@@ -11916,7 +11945,7 @@ CLIActionsConfigDef::CLIActionsConfigDef()
 
     def = this->add("export_settings", coString);
     def->label = L("Export Settings");
-    def->tooltip = L("This exports settings to a file.");
+    def->tooltip = L("This exports settings to a file. Use - to write them to stdout.");
     def->cli_params = "settings.json";
     def->set_default_value(new ConfigOptionString("output.json"));
 

src/libslic3r/PrintConfig.hpp

@@ -1391,6 +1391,8 @@ PRINT_CONFIG_CLASS_DEFINE(
     ((ConfigOptionBool,                 role_based_wipe_speed))
     ((ConfigOptionFloatOrPercent,       wipe_speed))
     ((ConfigOptionBool,                 wipe_on_loops))
+    ((ConfigOptionBool,                 wipe_inward))
+    ((ConfigOptionFloatOrPercent,        wipe_inward_distance))
     ((ConfigOptionBool,                 wipe_before_external_loop))
     ((ConfigOptionEnum<WallInfillOrder>, wall_infill_order))
     ((ConfigOptionBool,                 precise_outer_wall))

src/libslic3r/PrintObject.cpp

@@ -1574,6 +1574,8 @@ bool PrintObject::invalidate_state_by_config_options(
             || opt_key == "brim_flow_ratio"
             || opt_key == "filament_flow_ratio"
             || opt_key == "scarf_joint_flow_ratio"
+            || opt_key == "wipe_inward"
+            || opt_key == "wipe_inward_distance"
             || opt_key == "spiral_starting_flow_ratio"
             || opt_key == "spiral_finishing_flow_ratio") {
             invalidated |= m_print->invalidate_step(psGCodeExport);

src/libslic3r/Utils.hpp

@@ -314,6 +314,9 @@ extern unsigned get_current_pid();
 std::string per_user_temp_id();
 // Per-user temp root under `base`; an empty `user_id` returns `base` unchanged.
 std::string per_user_temp_dir(const std::string &base, const std::string &user_id);
+// Completes a relative command line input path against the current working directory. Absolute
+// paths and custom open protocol URLs are returned unchanged.
+std::string resolve_cli_input_path(const std::string &path);
 // BBS: backup & restore
 std::string get_process_name(int pid);
 

src/libslic3r/utils.cpp

@@ -1339,6 +1339,19 @@ std::string per_user_temp_dir(const std::string &base, const std::string &user_i
     return base + "/orcaslicer_" + user_id;
 }
 
+std::string resolve_cli_input_path(const std::string &path)
+{
+    const boost::filesystem::path input(path);
+    if (path.empty() || is_supported_open_protocol(path) || input.is_absolute())
+        return path;
+
+    boost::system::error_code ec;
+    const boost::filesystem::path resolved = boost::filesystem::system_complete(input, ec);
+    if (ec)
+        return path;
+    return resolved.lexically_normal().make_preferred().string();
+}
+
 // BBS: backup & restore
 std::string get_process_name(int pid)
 {

src/slic3r/GUI/ConfigManipulation.cpp

@@ -1104,6 +1104,9 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, in
     auto is_role_based_wipe_speed = config->opt_bool("role_based_wipe_speed");
     toggle_field("wipe_speed",!is_role_based_wipe_speed);
 
+    const bool have_wipe_inward = config->opt_bool("wipe_inward");
+    toggle_line("wipe_inward_distance", have_wipe_inward);
+
     for (auto el : {"accel_to_decel_enable", "accel_to_decel_factor"})
         toggle_line(el, gcf_is_klipper);
     if(gcf_is_klipper)

src/slic3r/GUI/GLCanvas3D.cpp

@@ -2097,12 +2097,6 @@ void GLCanvas3D::render(bool only_init)
     _render_selection_center();
 #endif // ENABLE_RENDER_SELECTION_CENTER
 
-    // we need to set the mouse's scene position here because the depth buffer
-    // could be invalidated by the following gizmo render methods
-    // this position is used later into on_mouse() to drag the objects
-    if (m_picking_enabled)
-        m_mouse.scene_position = _mouse_to_3d(m_mouse.position.cast<coord_t>());
-
     // sidebar hints need to be rendered before the gizmos because the depth buffer
     // could be invalidated by the following gizmo render methods
     _render_selection_sidebar_hints();
@@ -4485,12 +4479,13 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
                         BoundingBoxf3 volume_bbox = m_volumes.volumes[volume_idx]->transformed_bounding_box();
                         volume_bbox.offset(1.0);
                         const bool is_cut_connector_selected = m_selection.is_any_connector();
-                        if ((!any_gizmo_active || !evt.CmdDown()) && volume_bbox.contains(m_mouse.scene_position) && !is_cut_connector_selected) {
+                        const Vec3d scene_position = _mouse_to_3d(pos);
+                        if ((!any_gizmo_active || !evt.CmdDown()) && volume_bbox.contains(scene_position) && !is_cut_connector_selected) {
                             m_volumes.volumes[volume_idx]->hover = GLVolume::HS_None;
                             // The dragging operation is initiated.
                             m_mouse.drag.move_volume_idx = volume_idx;
                             m_selection.setup_cache();
-                            m_mouse.drag.start_position_3D = m_mouse.scene_position;
+                            m_mouse.drag.start_position_3D = scene_position;
                             m_sequential_print_clearance_first_displacement = true;
                             m_moving = true;
 

src/slic3r/GUI/GLCanvas3D.hpp

@@ -336,7 +336,6 @@ class GLCanvas3D
 
         bool dragging{ false };
         Vec2d position{ DBL_MAX, DBL_MAX };
-        Vec3d scene_position{ DBL_MAX, DBL_MAX, DBL_MAX };
         bool ignore_left_up{ false };
         Drag drag;
         bool ignore_right_up;

src/slic3r/GUI/Plater.cpp

@@ -15747,6 +15747,7 @@ void Plater::calib_pa(const Calib_Params& params)
     auto printer_config = &wxGetApp().preset_bundle->printers.get_edited_preset().config;
     print_config->set_key_value("overhang_reverse", new ConfigOptionBool(false));
     print_config->set_key_value("precise_z_height", new ConfigOptionBool(false));
+    print_config->set_key_value("wipe_inward", new ConfigOptionBool(false));
     printer_config->set_key_value("resonance_avoidance", new ConfigOptionBool{false});
     switch (params.mode) {
         case CalibMode::Calib_PA_Line:
@@ -16432,6 +16433,7 @@ void Plater::calib_retraction(const Calib_Params& params)
     auto obj = model().objects[0];
 
     print_config->set_key_value("enable_wrapping_detection", new ConfigOptionBool(false));
+    print_config->set_key_value("wipe_inward", new ConfigOptionBool(false));
 
     float nozzle_diameter = printer_config->option<ConfigOptionFloats>("nozzle_diameter")->get_at(0);
     float layer_height;

src/slic3r/GUI/PublishSettingsDialog.cpp

@@ -665,7 +665,7 @@ PublishSettingsDialog::PublishSettingsDialog(wxWindow* parent,
     };
     wxBoxSizer* links_sizer = new wxBoxSizer(wxVERTICAL);
     links_sizer->Add(make_link(_L("Publish 3MF Wiki"), "https://www.orcaslicer.com/wiki/publishing_3mf/publish_3mf.html"), 0, wxALIGN_LEFT);
-    links_sizer->Add(make_link(_L("Publish 3MF Video Guide"), "https://www.youtube.com/@OfficialOrcaSlicer/videos"), 0,
+    links_sizer->Add(make_link(_L("Publish 3MF Video Guide"), "https://www.youtube.com/watch?v=-xt1N29UIOg"), 0,
                      wxTOP | wxALIGN_LEFT, FromDIP(4));
 
     wxBoxSizer* footer = new wxBoxSizer(wxHORIZONTAL);

src/slic3r/GUI/Tab.cpp

@@ -2669,6 +2669,8 @@ void TabPrint::build()
         optgroup->append_single_option_line("role_based_wipe_speed","quality_settings_seam#role-based-wipe-speed");
         optgroup->append_single_option_line("wipe_speed", "quality_settings_seam#wipe-speed");
         optgroup->append_single_option_line("wipe_on_loops","quality_settings_seam#wipe-on-loop-inward-movement");
+        optgroup->append_single_option_line("wipe_inward", "quality_settings_seam#wipe-inward");
+        optgroup->append_single_option_line("wipe_inward_distance", "quality_settings_seam#wipe-inward");
         optgroup->append_single_option_line("wipe_before_external_loop","quality_settings_seam#wipe-before-external");
 
 

src/slic3r/Utils/CalibUtils.cpp

@@ -1096,6 +1096,7 @@ bool CalibUtils::calib_generic_PA(const CalibInfo &calib_info, wxString &error_m
         calib_pa_pattern(calib_info, model);
 
     DynamicPrintConfig print_config    = calib_info.print_prest->config;
+    print_config.set_key_value("wipe_inward", new ConfigOptionBool(false));
     DynamicPrintConfig filament_config = calib_info.filament_prest->config;
     DynamicPrintConfig printer_config  = calib_info.printer_prest->config;
 
@@ -1357,6 +1358,7 @@ void CalibUtils::calib_retraction(const CalibInfo &calib_info, wxString &error_m
     read_model_from_file(input_file, model);
 
     DynamicPrintConfig print_config    = calib_info.print_prest->config;
+    print_config.set_key_value("wipe_inward", new ConfigOptionBool(false));
     DynamicPrintConfig filament_config = calib_info.filament_prest->config;
     DynamicPrintConfig printer_config  = calib_info.printer_prest->config;