Fixed object adding to list with same object's name

+ Added name for main object for complex objects
+ Fixed incorrect Instances and Settings deleting from ObjectList
This commit is contained in:
YuSanka 2018-10-19 11:02:50 +02:00
parent d7f013ba19
commit 5557ee3cd2
4 changed files with 8 additions and 4 deletions

View file

@ -789,7 +789,7 @@ void PrusaObjectDataViewModel::GetItemInfo(const wxDataViewItem& item, ItemType&
type = itUndef;
PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
if (!node || node->GetIdx() < 0 && node->GetType() != itObject)
if (!node || node->GetIdx() < 0 && !(node->GetType() & (itObject|itSettings|itInstanceRoot)))
return;
idx = node->GetIdx();