Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion

This commit is contained in:
Enrico Turri 2019-10-11 08:19:24 +02:00
commit 8998a8e756

View File

@ -2331,6 +2331,7 @@ void ObjectList::changed_object(const int obj_idx/* = -1*/) const
void ObjectList::part_selection_changed()
{
if (m_extruder_editor) m_extruder_editor->Hide();
int obj_idx = -1;
int volume_id = -1;
m_config = nullptr;
@ -2954,7 +2955,6 @@ int ObjectList::get_selected_layers_range_idx() const
void ObjectList::update_selections()
{
if (m_extruder_editor) m_extruder_editor->Hide();
const Selection& selection = wxGetApp().plater()->canvas3D()->get_selection();
wxDataViewItemArray sels;