mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: fix a crash at meshboolean, when the selected volume be deleted 

jira: STUDIO-8047

Change-Id: I830081a895ec6fee9a80559f07cfd211666a41cb
This commit is contained in:
liz.li 2024-09-24 15:00:56 +08:00 committed by Lane.Wei
parent 2c00387e57
commit 3fe6284b7f
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp
View File

@ -490,9 +490,17 @@ void GLGizmoMeshBoolean::generate_new_volume(bool delete_input, const TriangleMe
std::swap(curr_model_object->volumes[m_src.volume_idx], curr_model_object->volumes.back()); std::swap(curr_model_object->volumes[m_src.volume_idx], curr_model_object->volumes.back());
curr_model_object->delete_volume(curr_model_object->volumes.size() - 1); curr_model_object->delete_volume(curr_model_object->volumes.size() - 1);
int obj_idx = m_parent.get_selection().get_object_idx();
if (obj_idx == -1) {
auto& objects = *wxGetApp().obj_list()->objects();
auto it = std::find(objects.begin(), objects.end(), curr_model_object);
if (it != objects.end())
obj_idx = it - objects.begin();
}
assert(obj_idx != -1);
if (delete_input) { if (delete_input) {
std::vector<ItemForDelete> items; std::vector<ItemForDelete> items;
auto obj_idx = m_parent.get_selection().get_object_idx();
items.emplace_back(ItemType::itVolume, obj_idx, m_tool.volume_idx); items.emplace_back(ItemType::itVolume, obj_idx, m_tool.volume_idx);
wxGetApp().obj_list()->delete_from_model_and_list(items); wxGetApp().obj_list()->delete_from_model_and_list(items);
} }
@ -501,13 +509,11 @@ void GLGizmoMeshBoolean::generate_new_volume(bool delete_input, const TriangleMe
//curr_model_object->sort_volumes(true); //curr_model_object->sort_volumes(true);
wxGetApp().plater()->update(); wxGetApp().plater()->update();
wxGetApp().obj_list()->select_item([this, new_volume]() { wxGetApp().obj_list()->select_item([this, new_volume, obj_idx]() {
wxDataViewItem sel_item; wxDataViewItem sel_item;
wxDataViewItemArray items = wxGetApp().obj_list()->reorder_volumes_and_get_selection(obj_idx, [new_volume](const ModelVolume* volume) { return volume == new_volume; });
wxDataViewItemArray items = wxGetApp().obj_list()->reorder_volumes_and_get_selection(m_parent.get_selection().get_object_idx(), [new_volume](const ModelVolume* volume) { return volume == new_volume; });
if (!items.IsEmpty()) if (!items.IsEmpty())
sel_item = items.front(); sel_item = items.front();
return sel_item; return sel_item;
}); });