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

Fixed ObjectList::last_volume_is_deleted() to avoid clearing volume[0].config after undo/redo

Browse Source
This commit is contained in:
YuSanka 2019-07-23 17:09:19 +02:00
parent a121253520
commit 804e1b1939
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1741,7 +1741,7 @@ void ObjectList::del_subobject_item(wxDataViewItem& item)
ItemType type; ItemType type;
m_objects_model->GetItemInfo(item, type, obj_idx, idx); m_objects_model->GetItemInfo(item, type, obj_idx, idx);
if (type & itUndef) if (type == itUndef)
return; return;
if (type & itSettings) if (type & itSettings)
@ -3101,7 +3101,7 @@ void ObjectList::change_part_type()
void ObjectList::last_volume_is_deleted(const int obj_idx) void ObjectList::last_volume_is_deleted(const int obj_idx)
{ {
if (obj_idx < 0 || obj_idx >= m_objects->size() || (*m_objects)[obj_idx]->volumes.empty()) if (obj_idx < 0 || obj_idx >= m_objects->size() || (*m_objects)[obj_idx]->volumes.size() != 1)
return; return;
auto volume = (*m_objects)[obj_idx]->volumes.front(); auto volume = (*m_objects)[obj_idx]->volumes.front();

2
src/slic3r/GUI/wxExtensions.cpp
View File

@ -1508,7 +1508,7 @@ ItemType ObjectDataViewModel::GetItemType(const wxDataViewItem &item) const
if (!item.IsOk()) if (!item.IsOk())
return itUndef; return itUndef;
ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID(); ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
return node->m_type; return node->m_type < 0 ? itUndef : node->m_type;
} }
wxDataViewItem ObjectDataViewModel::GetItemByType(const wxDataViewItem &parent_item, ItemType type) const wxDataViewItem ObjectDataViewModel::GetItemByType(const wxDataViewItem &parent_item, ItemType type) const