mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-16 06:25:59 +08:00
Fixed conflict after merge
This commit is contained in:
parent
9dc7b70084
commit
666b8ae5e4
@ -3900,7 +3900,7 @@ void GCodeProcessor::post_process()
|
|||||||
++m_times_cache_id;
|
++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;
|
return ret;
|
||||||
|
|
||||||
// search for internal G1 lines
|
// search for internal G1 lines
|
||||||
|
Loading…
x
Reference in New Issue
Block a user