mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2024-12-22 03:46:50 +01:00
Always look for unique node names in owner if not found in owned nodes
(cherry picked from commit 95ced4bbdcea4d8e225e235fc120c4ebd72f443d)
This commit is contained in:
parent
2653e5d530
commit
18cabe9d32
@ -1911,23 +1911,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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user