diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2020-02-07 11:49:48 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2020-02-07 11:49:48 +0300 |
| commit | a1c0a29af21b34d06baec2f07e023ee0fb81b66a (patch) | |
| tree | 1de6c0eb2d4e3f611fd9fb4b72653d6bf5e9e7db /src/slic3r/GUI/GUI_ObjectList.cpp | |
| parent | 455f36119aae14a6a50ed2743b4bb1bb997c8682 (diff) | |
ENABLE_BACKWARD_COMPATIBLE_RELOAD_FROM_DISK - Fixed inconsistencies for splitted and cutted objects
Diffstat (limited to 'src/slic3r/GUI/GUI_ObjectList.cpp')
| -rw-r--r-- | src/slic3r/GUI/GUI_ObjectList.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index f4c2c7093..6e5c601d3 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -1651,14 +1651,9 @@ void ObjectList::append_menu_item_export_stl(wxMenu* menu) const void ObjectList::append_menu_item_reload_from_disk(wxMenu* menu) const { -#if ENABLE_BACKWARD_COMPATIBLE_RELOAD_FROM_DISK - append_menu_item(menu, wxID_ANY, _(L("Reload from disk")), _(L("Reload the selected volumes from disk")), - [this](wxCommandEvent&) { wxGetApp().plater()->reload_from_disk(); }, "", menu); -#else append_menu_item(menu, wxID_ANY, _(L("Reload from disk")), _(L("Reload the selected volumes from disk")), [this](wxCommandEvent&) { wxGetApp().plater()->reload_from_disk(); }, "", menu, []() { return wxGetApp().plater()->can_reload_from_disk(); }, wxGetApp().plater()); -#endif // ENABLE_BACKWARD_COMPATIBLE_RELOAD_FROM_DISK } void ObjectList::append_menu_item_change_extruder(wxMenu* menu) const @@ -2275,6 +2270,10 @@ void ObjectList::split() add_settings_item(vol_item, &volume->config); } +#if ENABLE_BACKWARD_COMPATIBLE_RELOAD_FROM_DISK + model_object->input_file.clear(); +#endif // ENABLE_BACKWARD_COMPATIBLE_RELOAD_FROM_DISK + if (parent == item) Expand(parent); @@ -3928,15 +3927,10 @@ void ObjectList::show_multi_selection_menu() _(L("Select extruder number for selected objects and/or parts")), [this](wxCommandEvent&) { extruder_selection(); }, "", menu); -#if ENABLE_BACKWARD_COMPATIBLE_RELOAD_FROM_DISK - append_menu_item(menu, wxID_ANY, _(L("Reload from disk")), _(L("Reload the selected volumes from disk")), - [this](wxCommandEvent&) { wxGetApp().plater()->reload_from_disk(); }, "", menu); -#else append_menu_item(menu, wxID_ANY, _(L("Reload from disk")), _(L("Reload the selected volumes from disk")), [this](wxCommandEvent&) { wxGetApp().plater()->reload_from_disk(); }, "", menu, []() { return wxGetApp().plater()->can_reload_from_disk(); }, wxGetApp().plater()); -#endif // ENABLE_BACKWARD_COMPATIBLE_RELOAD_FROM_DISK wxGetApp().plater()->PopupMenu(menu); } |