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

Merge pull request #89686 from kleonc/unique-node-names-check-owned-then-in-owner 

Always look for unique node names in owner if not found in owned nodes
This commit is contained in:
Rémi Verschelde 2024-03-24 01:21:28 +01:00
parent 8f9136963d 95ced4bbdc
commit 9d8697ab01
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scene/main/node.cpp
View File

@ -1755,23 +1755,14 @@ Node *Node::get_node_or_null(const NodePath &p_path) const {
}
} else if (name.is_node_unique_name()) {
if (current->data.owned_unique_nodes.size()) {
// Has unique nodes in ownership
Node **unique = current->data.owned_unique_nodes.getptr(name);
if (!unique) {
return nullptr;
}
next = *unique;
} else if (current->data.owner) {
Node **unique = current->data.owner->data.owned_unique_nodes.getptr(name);
if (!unique) {
return nullptr;
}
next = *unique;
} else {
Node **unique = current->data.owned_unique_nodes.getptr(name);
if (!unique && current->data.owner) {
unique = current->data.owner->data.owned_unique_nodes.getptr(name);
}
if (!unique) {
return nullptr;
}
next = *unique;
} else {
next = nullptr;
const Node *const *node = current->data.children.getptr(name);