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

src/slic3r/GUI/GLCanvas3D.cpp

@@ -896,7 +896,11 @@ void GLCanvas3D::Selection::add(unsigned int volume_idx, bool as_single_selectio
     if (needs_reset)
         clear();
 
-    m_mode = volume->is_modifier ? Volume : Instance;
+    if (volume->is_modifier)
+        m_mode = Volume;
+    else if (!contains_volume(volume_idx))
+        m_mode = Instance;
+    // else -> keep current mode
 
     switch (m_mode)
     {

src/slic3r/GUI/GUI_ObjectSettings.hpp

@@ -2,6 +2,7 @@
 #define slic3r_GUI_ObjectSettings_hpp_
 
 #include <memory>
+#include <vector>
 #include <wx/panel.h>
 
 class wxBoxSizer;

src/slic3r/GUI/KBShortcutsDialog.hpp

@@ -3,6 +3,7 @@
 
 #include <wx/wx.h>
 #include <map>
+#include <vector>
 
 namespace Slic3r { 
 namespace GUI {

src/slic3r/GUI/Plater.cpp

@@ -1997,9 +1997,6 @@ void Plater::priv::schedule_background_process()
     this->background_process_timer.Start(500, wxTIMER_ONE_SHOT);
     // Notify the Canvas3D that something has changed, so it may invalidate some of the layer editing stuff.
     this->view3D->get_canvas3d()->set_config(this->config);
-    // Reset gcode preview
-    this->preview->get_canvas3d()->reset_volumes();
-    this->preview->get_canvas3d()->reset_legend_texture();
 }
 
 void Plater::priv::update_print_volume_state()