godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop pasted child nodes being assigned an owner when previously unowned 

Make copy and pasting match duplication's ownership transferral behavior by storing ownership information in the duplicated nodes on the node clipboard, then checking that information when setting owners for pasted nodes.
This commit is contained in:
SnailRhymer 2022-07-17 23:16:43 +01:00 committed by Yuri Sizov
parent 5dd52f47b1
commit 526d299623
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
editor/scene_tree_dock.cpp
View File

@ -482,6 +482,20 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
ERR_CONTINUE(!dup);
// Preserve ownership relations ready for pasting.
List<Node *> owned;
node->get_owned_by(node->get_owner(), &owned);
for (Node *F : owned) {
if (!duplimap.has(F) || F == node) {
continue;
}
Node *d = duplimap[F];
// Only use this as a marker that ownership needs to be assigned when pasting.
// The actual owner doesn't matter.
d->set_owner(dup);
}
node_clipboard.push_back(dup);
}
@ -3239,7 +3253,8 @@ List<Node *> SceneTreeDock::paste_nodes() {
for (KeyValue<const Node *, Node *> &E2 : duplimap) {
Node *d = E2.value;
if (d != dup) {
// When copying, all nodes that should have an owner assigned here were given node as an owner.
if (d != dup && E2.key->get_owner() == node) {
ur->add_do_method(d, "set_owner", owner);
}
}