From 666b8ae5e441e7eff970f8bd5868496b2e562766 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Wed, 27 Mar 2024 17:08:32 +0100 Subject: [PATCH] Fixed conflict after merge --- src/libslic3r/GCode/GCodeProcessor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp index b1c670d68f..36ae514bcf 100644 --- a/src/libslic3r/GCode/GCodeProcessor.cpp +++ b/src/libslic3r/GCode/GCodeProcessor.cpp @@ -3900,7 +3900,7 @@ void GCodeProcessor::post_process() ++m_times_cache_id; } - if (it == m_machine.g1_times_cache.end() || it->id > g1_lines_counter) + if (it == m_machines[Normal].g1_times_cache.end() || it->id > g1_lines_counter) return ret; // search for internal G1 lines