Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable merging of groups when objects also in segments #1309

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Enable merging of groups when objects also in segments #1309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion neo/core/container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,8 @@ def merge(self, other):
lookup[obj.name] = obj
ids.append(id(obj))
getattr(self, container).append(obj)
obj.set_parent(self)
if self.__class__.__name__ in obj._parent_objects:
obj.set_parent(self)

# use the BaseNeo merge as well
super().merge(other)
Expand Down