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

1 files changed, 6 insertions, 15 deletions

diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 9e35d29dc8..d4e2d6eb16 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -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);