Fixed a bug with erase of the multiple instance selection in 3D-scene
+ Try to fix accidentally crash on Copy/Paste
This commit is contained in:
parent
6ea5781709
commit
23b6a597a8
2 changed files with 3 additions and 1 deletions
|
@ -3952,6 +3952,8 @@ void ObjectList::select_items(const wxDataViewItemArray& sels)
|
||||||
{
|
{
|
||||||
m_prevent_list_events = true;
|
m_prevent_list_events = true;
|
||||||
|
|
||||||
|
m_last_selected_item = sels.empty() ? wxDataViewItem(nullptr) : sels.back();
|
||||||
|
|
||||||
UnselectAll();
|
UnselectAll();
|
||||||
SetSelections(sels);
|
SetSelections(sels);
|
||||||
part_selection_changed();
|
part_selection_changed();
|
||||||
|
|
|
@ -1160,7 +1160,7 @@ void Selection::erase()
|
||||||
if (obj_ins.first == glv_obj_idx) {
|
if (obj_ins.first == glv_obj_idx) {
|
||||||
if (obj_ins.second.find(glv_ins_idx) != obj_ins.second.end()) {
|
if (obj_ins.second.find(glv_ins_idx) != obj_ins.second.end()) {
|
||||||
if (obj_ins.second.size() == model_object->instances.size())
|
if (obj_ins.second.size() == model_object->instances.size())
|
||||||
items_set.insert(ItemForDelete(ItemType::itVolume, glv_obj_idx, gl_vol->volume_idx()));
|
items_set.insert(ItemForDelete(ItemType::itObject, glv_obj_idx, -1));
|
||||||
else
|
else
|
||||||
items_set.insert(ItemForDelete(ItemType::itInstance, glv_obj_idx, glv_ins_idx));
|
items_set.insert(ItemForDelete(ItemType::itInstance, glv_obj_idx, glv_ins_idx));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue