From 2afaefad24858e809edcbe2f8c148e8f6b0ac977 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Wed, 9 Oct 2019 12:36:13 +0200 Subject: [PATCH] Bugfix for extruders Column: suppress draw bitmap for Instance and allow Extruder editing for Layer Range --- src/slic3r/GUI/wxExtensions.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index 051a27220..f1b658867 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -579,6 +579,9 @@ void ObjectDataViewModelNode::set_action_and_extruder_icons() m_type & (itVolume | itLayer) ? "cog" : /*m_type & itInstance*/ "set_separate_obj"; m_action_icon = create_scaled_bitmap(nullptr, m_action_icon_name); // FIXME: pass window ptr + if (m_type & itInstance) + return; // don't set colored bitmap for Instance + // set extruder bitmap int extruder_idx = atoi(m_extruder.c_str()); if (extruder_idx > 0) --extruder_idx; @@ -2149,7 +2152,7 @@ wxWindow* BitmapChoiceRenderer::CreateEditorCtrl(wxWindow* parent, wxRect labelR wxDataViewCtrl* const dv_ctrl = GetOwner()->GetOwner(); ObjectDataViewModel* const model = dynamic_cast(dv_ctrl->GetModel()); - if (!(model->GetItemType(dv_ctrl->GetSelection()) & (itVolume | itObject))) + if (!(model->GetItemType(dv_ctrl->GetSelection()) & (itVolume | itLayer | itObject))) return nullptr; std::vector icons = get_extruder_color_icons();