mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 07:27:41 -06:00
Merge branch 'main' into skirt-object-fix-pr
This commit is contained in:
commit
5b5cd478c2
160 changed files with 13381 additions and 10798 deletions
|
@ -5647,6 +5647,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
|
|||
size_t start_index = fitting_result[fitting_index].start_point_index;
|
||||
size_t end_index = fitting_result[fitting_index].end_point_index;
|
||||
for (size_t point_index = start_index + 1; point_index < end_index + 1; point_index++) {
|
||||
tempDescription = description;
|
||||
const Line line = Line(path.polyline.points[point_index - 1], path.polyline.points[point_index]);
|
||||
const double line_length = line.length() * SCALING_FACTOR;
|
||||
if (line_length < EPSILON)
|
||||
|
@ -5970,8 +5971,10 @@ std::string GCode::travel_to(const Point& point, ExtrusionRole role, std::string
|
|||
|
||||
// generate G-code for the travel move
|
||||
if (needs_retraction) {
|
||||
if (m_config.reduce_crossing_wall && could_be_wipe_disabled)
|
||||
m_wipe.reset_path();
|
||||
// ORCA: Fix scenario where wipe is disabled when avoid crossing perimeters was enabled even though a retraction move was performed.
|
||||
// This replicates the existing behaviour of always wiping when retracting
|
||||
/*if (m_config.reduce_crossing_wall && could_be_wipe_disabled)
|
||||
m_wipe.reset_path();*/
|
||||
|
||||
Point last_post_before_retract = this->last_pos();
|
||||
gcode += this->retract(false, false, lift_type);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue