diff options
| author | YuSanka <yusanka@gmail.com> | 2020-07-21 10:47:29 +0300 |
|---|---|---|
| committer | YuSanka <yusanka@gmail.com> | 2020-07-21 10:47:29 +0300 |
| commit | f138978fe7e16fff8a2cf5a6a1d8b1792ed3d8b3 (patch) | |
| tree | a8bc180efa810bf9a8544d44413f1ad124410630 /src/slic3r/GUI/GUI_ObjectList.cpp | |
| parent | 3d990a918904fb1ab10afa4f95f2885350821994 (diff) | |
| parent | 6057fb95958dd03dc8de8d0a92cd2017fbb40c6b (diff) | |
Merge remote-tracking branch 'origin/master' into ys_ph_printers
Diffstat (limited to 'src/slic3r/GUI/GUI_ObjectList.cpp')
| -rw-r--r-- | src/slic3r/GUI/GUI_ObjectList.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index b87565b03..1ddcc0f6d 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -347,7 +347,7 @@ void ObjectList::get_selection_indexes(std::vector<int>& obj_idxs, std::vector<i else { for (wxDataViewItem item : sels) { const ItemType type = m_objects_model->GetItemType(item); - assert(type & itObject | itInstance | itInstanceRoot); + assert(type & (itObject | itInstance | itInstanceRoot)); obj_idxs.emplace_back(type & itObject ? m_objects_model->GetIdByItem(item) : m_objects_model->GetIdByItem(m_objects_model->GetTopParent(item))); |