Cherry-picking 118f4859c472ccbc30b43101c6674dadc81d7b12
And resolve conflicts
This commit is contained in:
parent
ce5d242f76
commit
f100a59688
19 changed files with 674 additions and 735 deletions
|
@ -476,6 +476,11 @@ public:
|
|||
const PrintObjects& objects() const { return m_objects; }
|
||||
// PrintObject by its ObjectID, to be used to uniquely bind slicing warnings to their source PrintObjects
|
||||
// in the notification center.
|
||||
const SLAPrintObject* get_print_object_by_model_object_id(ObjectID object_id) const {
|
||||
auto it = std::find_if(m_objects.begin(), m_objects.end(),
|
||||
[object_id](const SLAPrintObject* obj) { return obj->model_object()->id() == object_id; });
|
||||
return (it == m_objects.end()) ? nullptr : *it;
|
||||
}
|
||||
const SLAPrintObject* get_object(ObjectID object_id) const {
|
||||
auto it = std::find_if(m_objects.begin(), m_objects.end(),
|
||||
[object_id](const SLAPrintObject *obj) { return obj->id() == object_id; });
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue