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

This commit is contained in:
Enrico Turri 2019-03-18 13:06:19 +01:00
commit 08ca5f1138
2 changed files with 4 additions and 4 deletions

View file

@ -371,6 +371,9 @@ void Preview::load_print()
void Preview::reload_print(bool force, bool keep_volumes)
{
if (!IsShown() && !force)
return;
if (!keep_volumes)
{
m_canvas->reset_volumes();
@ -378,9 +381,6 @@ void Preview::reload_print(bool force, bool keep_volumes)
m_loaded = false;
}
if (!IsShown() && !force)
return;
load_print();
}