juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 10:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a crash when deleting several instances of one object

Browse Source
This commit is contained in:
Lukas Matena
2019-01-04 21:36:58 +01:00
parent 60926e7be3
commit bdf4d5f41f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/GLCanvas3D.cpp
View File

@@ -1894,8 +1894,6 @@ void GLCanvas3D::Selection::erase()
} }
wxGetApp().obj_list()->delete_from_model_and_list(items); wxGetApp().obj_list()->delete_from_model_and_list(items);
} }
else if (is_single_full_instance())
wxGetApp().obj_list()->delete_from_model_and_list(ItemType::itInstance, get_object_idx(), get_instance_idx());
else if (is_multiple_full_instance()) else if (is_multiple_full_instance())
{ {
std::set<std::pair<int, int>> instances_idxs; std::set<std::pair<int, int>> instances_idxs;
@@ -1915,6 +1913,8 @@ void GLCanvas3D::Selection::erase()
} }
wxGetApp().obj_list()->delete_from_model_and_list(items); wxGetApp().obj_list()->delete_from_model_and_list(items);
} }
else if (is_single_full_instance())
wxGetApp().obj_list()->delete_from_model_and_list(ItemType::itInstance, get_object_idx(), get_instance_idx());
else if (is_mixed()) else if (is_mixed())
{ {
std::set<ItemForDelete> items_set; std::set<ItemForDelete> items_set;