3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 00:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring

Browse source
This commit is contained in:
Enrico Turri 2019-03-15 09:15:11 +01:00
commit 6ab0a526b3
14 changed files with 234 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/GUI_Preview.cpp
View file

@ -752,10 +752,11 @@ void Preview::load_print_as_fff()
if (IsShown())
{
if (gcode_preview_data_valid)
if (gcode_preview_data_valid) {
// Load the real G-code preview.
m_canvas->load_gcode_preview(*m_gcode_preview_data, colors);
else
m_loaded = true;
} else
// Load the initial preview based on slices, not the final G-code.
m_canvas->load_preview(colors, color_print_values);
show_hide_ui_elements(gcode_preview_data_valid ? "full" : "simple");
@ -767,7 +768,6 @@ void Preview::load_print_as_fff()
m_canvas_widget->Refresh();
} else
update_sliders(zs);
m_loaded = true;
}
}