From c506c15ed43c8327e863cad2f27b640d9544be28 Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Tue, 19 Jan 2021 16:50:24 +0100 Subject: [PATCH] Manual merge of 4e586b8edabde1146c4013ca2437469a448315e2 from upsteam Slic3r, fixing "percent first layer speed was not applied over autospeed." GH upstream Slic3r #2945 our GH issue First Layer Speed Percentage not applying (#5829) --- src/libslic3r/GCode.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index cc9dfce30f..87bfe30654 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -2591,10 +2591,10 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, throw Slic3r::InvalidArgument("Invalid speed"); } } - if (this->on_first_layer()) - speed = m_config.get_abs_value("first_layer_speed", speed); if (m_volumetric_speed != 0. && speed == 0) speed = m_volumetric_speed / path.mm3_per_mm; + if (this->on_first_layer()) + speed = m_config.get_abs_value("first_layer_speed", speed); if (m_config.max_volumetric_speed.value > 0) { // cap speed with max_volumetric_speed anyway (even if user is not using autospeed) speed = std::min(