From 448d773da0e6d9ee31448d8a8817971269f59d7f Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Tue, 20 Aug 2019 15:26:57 +0200
Subject: [PATCH] Fixed default transparency for ColorPicker from sidebar (was
 appeared under OSX for empty extruder color). + Fixed wrong getting of
 instance printable value inside add_object_to_list()

---
 src/slic3r/GUI/GUI_ObjectList.cpp | 4 ++--
 src/slic3r/GUI/Plater.cpp         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index 0f1861550..e0bdd26df 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -2306,14 +2306,14 @@ void ObjectList::add_object_to_list(size_t obj_idx, bool call_selection_changed)
     {
         std::vector<bool> print_idicator(model_object->instances.size());
         for (int i = 0; i < model_object->instances.size(); ++i)
-            print_idicator[i] = model_object->instances[i]->is_printable();
+            print_idicator[i] = model_object->instances[i]->printable;
 
         const wxDataViewItem object_item = m_objects_model->GetItemById(obj_idx);
         m_objects_model->AddInstanceChild(object_item, print_idicator);
         Expand(m_objects_model->GetInstanceRootItem(object_item));
     }
     else
-        m_objects_model->SetPrintableState(model_object->instances[0]->is_printable() ? piPrintable : piUnprintable, obj_idx);
+        m_objects_model->SetPrintableState(model_object->instances[0]->printable ? piPrintable : piUnprintable, obj_idx);
 
     // add settings to the object, if it has those
     add_settings_item(item, &model_object->config);
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 71d8e3910..476caead1 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -290,7 +290,7 @@ wxBitmapComboBox(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(15 *
             auto colors = static_cast<ConfigOptionStrings*>(cfg->option("extruder_colour")->clone());
             wxColour clr(colors->values[extruder_idx]);
             if (!clr.IsOk())
-                clr = wxTransparentColour;
+                clr = wxColour(0,0,0); // Don't set alfa to transparence
 
             auto data = new wxColourData();
             data->SetChooseFull(1);