1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-14 08:34:26 +00:00

Fixed conflicts after merge with master

This commit is contained in:
enricoturri1966
2021-05-20 15:37:56 +02:00
8 changed files with 73 additions and 8 deletions
+1 -1
View File
@@ -596,7 +596,7 @@ void GCodeViewer::load(const GCodeProcessor::Result& gcode_result, const Print&
m_last_result_id = gcode_result.id;
// release gpu memory, if used
reset();
reset();
#if ENABLE_GCODE_WINDOW
m_sequential_view.gcode_window.set_filename(gcode_result.filename);