From dac301e3b68be4cd3da5e4a2bbef764d33747e94 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Fri, 16 Aug 2019 13:14:51 +0200
Subject: [PATCH] Update volumes on 3DScene, after adding of part for
 unprintable object

---
 src/slic3r/GUI/GLCanvas3D.cpp     | 29 ++++++++++++++++-------------
 src/slic3r/GUI/GLCanvas3D.hpp     |  1 +
 src/slic3r/GUI/GUI_ObjectList.cpp | 12 ++++++++----
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 0d0d4d84b..a5906f619 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -1319,22 +1319,25 @@ void GLCanvas3D::toggle_model_objects_visibility(bool visible, const ModelObject
         _set_warning_texture(WarningTexture::SomethingNotShown, false);
 }
 
+void GLCanvas3D::update_instance_printable_state_for_object(const size_t obj_idx)
+{
+    ModelObject* model_object = m_model->objects[obj_idx];
+    for (int inst_idx = 0; inst_idx < model_object->instances.size(); inst_idx++)
+    {
+        ModelInstance* instance = model_object->instances[inst_idx];
+
+        for (GLVolume* volume : m_volumes.volumes)
+        {
+            if ((volume->object_idx() == obj_idx) && (volume->instance_idx() == inst_idx))
+                volume->printable = instance->printable;
+        }
+    }
+}
+
 void GLCanvas3D::update_instance_printable_state_for_objects(std::vector<size_t>& object_idxs)
 {
     for (size_t obj_idx : object_idxs)
-    {
-        ModelObject* model_object = m_model->objects[obj_idx];
-        for (int inst_idx = 0; inst_idx < model_object->instances.size(); inst_idx++)
-        {
-            ModelInstance* instance = model_object->instances[inst_idx];
-
-            for (GLVolume* volume : m_volumes.volumes)
-            {
-                if ((volume->object_idx() == obj_idx) && (volume->instance_idx() == inst_idx))
-                    volume->printable = instance->printable;
-            }
-        }
-    }
+        update_instance_printable_state_for_object(obj_idx);
 }
 
 void GLCanvas3D::set_config(const DynamicPrintConfig* config)
diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
index c1fc5a948..577682fe2 100644
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@@ -482,6 +482,7 @@ public:
 
     void toggle_sla_auxiliaries_visibility(bool visible, const ModelObject* mo = nullptr, int instance_idx = -1);
     void toggle_model_objects_visibility(bool visible, const ModelObject* mo = nullptr, int instance_idx = -1);
+    void update_instance_printable_state_for_object(size_t obj_idx);
     void update_instance_printable_state_for_objects(std::vector<size_t>& object_idxs);
 
     void set_config(const DynamicPrintConfig* config);
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index b3bedaf50..3d5efe63f 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -1616,6 +1616,9 @@ void ObjectList::load_subobject(ModelVolumeType type)
 
 
     changed_object(obj_idx);
+    if (type == ModelVolumeType::MODEL_PART)
+        // update printable state on canvas
+        wxGetApp().plater()->canvas3D()->update_instance_printable_state_for_object((size_t)obj_idx);
 
     wxDataViewItem sel_item;
     for (const auto& volume : volumes_info )
@@ -1739,6 +1742,9 @@ void ObjectList::load_generic_subobject(const std::string& type_name, const Mode
     new_volume->config.set_key_value("extruder", new ConfigOptionInt(0));
 
     changed_object(obj_idx);
+    if (type == ModelVolumeType::MODEL_PART)
+        // update printable state on canvas
+        wxGetApp().plater()->canvas3D()->update_instance_printable_state_for_object((size_t)obj_idx);
 
     const auto object_item = m_objects_model->GetTopParent(GetSelection());
     select_item(m_objects_model->AddVolumeChild(object_item, name, type, 
@@ -3351,9 +3357,8 @@ void ObjectList::instances_to_separated_object(const int obj_idx, const std::set
         delete_instance_from_list(obj_idx, *it);
     }
 
-    std::vector<size_t> object_idxs = { new_obj_indx };
     // update printable state for new volumes on canvas3D
-    wxGetApp().plater()->canvas3D()->update_instance_printable_state_for_objects(object_idxs);
+    wxGetApp().plater()->canvas3D()->update_instance_printable_state_for_object(new_obj_indx);
 }
 
 void ObjectList::instances_to_separated_objects(const int obj_idx)
@@ -3684,8 +3689,7 @@ void ObjectList::toggle_printable_state(wxDataViewItem item)
             inst->printable = printable;
 
         // update printable state on canvas
-        std::vector<size_t> obj_idxs = {(size_t)obj_idx};
-        wxGetApp().plater()->canvas3D()->update_instance_printable_state_for_objects(obj_idxs);
+        wxGetApp().plater()->canvas3D()->update_instance_printable_state_for_object((size_t)obj_idx);
 
         // update printable state in ObjectList
         m_objects_model->SetObjectPrintableState(printable ? piPrintable : piUnprintable , item);