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

Merge remote-tracking branch 'PRIVATE/master' into ys_cut

Browse source
This commit is contained in:
YuSanka 2022-09-08 13:32:14 +02:00
commit 484eae7a1c
229 changed files with 25931 additions and 20729 deletions
src/slic3r/GUI
GUI_ObjectList.cpp

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

@ -980,7 +980,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));
@ -1005,6 +1005,7 @@ void ObjectList::extruder_editing()
m_extruder_editor->Hide();
update_extruder_in_config(item);
Refresh();
};
// to avoid event propagation to other sidebar items
@ -1422,9 +1423,8 @@ void ObjectList::load_subobject(ModelVolumeType type, bool from_galery/* = false
wxArrayString input_files;
if (from_galery) {
GalleryDialog dlg(this);
if (dlg.ShowModal() != wxID_CLOSE)
dlg.get_input_files(input_files);
if (wxGetApp().gallery_dialog()->show() != wxID_CLOSE)
wxGetApp().gallery_dialog()->get_input_files(input_files);
}
else
wxGetApp().import_model(wxGetApp().tab_panel()->GetPage(0), input_files);
@ -1750,10 +1750,10 @@ void ObjectList::load_shape_object_from_gallery()
return;// Add nothing if something is selected on 3DScene
wxArrayString input_files;
GalleryDialog gallery_dlg(this);
if (gallery_dlg.ShowModal() == wxID_CLOSE)
GalleryDialog* gallery_dlg = wxGetApp().gallery_dialog();
if (gallery_dlg->show() == wxID_CLOSE)
return;
gallery_dlg.get_input_files(input_files);
gallery_dlg->get_input_files(input_files);
if (input_files.IsEmpty())
return;
load_shape_object_from_gallery(input_files);