3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into fs_emboss

Browse source 
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Selection.cpp
This commit is contained in:
Filip Sykala - NTB T15p 2022-09-14 11:28:36 +02:00
commit ed6a1b18f3
115 changed files with 19036 additions and 16206 deletions
src/slic3r/GUI
GUI_ObjectList.cpp

3
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -991,7 +991,7 @@ void ObjectList::show_context_menu(const bool evt_context_menu)
void ObjectList::extruder_editing()
{
wxDataViewItem item = GetSelection();
if (!item || !(m_objects_model->GetItemType(item) & (itVolume | itObject)))
if (!item || !(m_objects_model->GetItemType(item) & (itVolume | itObject | itLayer)))
return;
wxRect rect = this->GetItemRect(item, GetColumn(colExtruder));
@ -1016,6 +1016,7 @@ void ObjectList::extruder_editing()
m_extruder_editor->Hide();
update_extruder_in_config(item);
Refresh();
};
// to avoid event propagation to other sidebar items