GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-14 16:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

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-19 10:59:16 +01:00
commit ca623b9a83
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/slic3r/GUI/GUI_Preview.cpp
View File

@ -368,12 +368,7 @@ void Preview::load_print(bool keep_z_range)
void Preview::reload_print(bool keep_volumes) void Preview::reload_print(bool keep_volumes)
{ {
if (!IsShown()) #ifndef __linux__
{
m_volumes_cleanup_required = !keep_volumes;
return;
}
if (m_volumes_cleanup_required || !keep_volumes) if (m_volumes_cleanup_required || !keep_volumes)
{ {
m_canvas->reset_volumes(); m_canvas->reset_volumes();
@ -381,6 +376,23 @@ void Preview::reload_print(bool keep_volumes)
m_loaded = false; m_loaded = false;
m_volumes_cleanup_required = false; m_volumes_cleanup_required = false;
} }
#endif // __linux__
if (!IsShown())
{
m_volumes_cleanup_required = !keep_volumes;
return;
}
#ifdef __linux__
if (m_volumes_cleanup_required || !keep_volumes)
{
m_canvas->reset_volumes();
m_canvas->reset_legend_texture();
m_loaded = false;
m_volumes_cleanup_required = false;
}
#endif // __linux__
load_print(); load_print();
} }