Rework Node::get_node to omit is_absolute() check in best case scenario
(cherry picked from commit e2792cc71c
)
This commit is contained in:
parent
96a325dec8
commit
d3473b2a95
1 changed files with 8 additions and 6 deletions
|
@ -1303,12 +1303,14 @@ Node *Node::get_node_or_null(const NodePath &p_path) const {
|
|||
|
||||
Node *Node::get_node(const NodePath &p_path) const {
|
||||
Node *node = get_node_or_null(p_path);
|
||||
if (p_path.is_absolute()) {
|
||||
ERR_FAIL_COND_V_MSG(!node, nullptr,
|
||||
vformat("(Node not found: \"%s\" (absolute path attempted from \"%s\").)", p_path, get_path()));
|
||||
} else {
|
||||
ERR_FAIL_COND_V_MSG(!node, nullptr,
|
||||
vformat("(Node not found: \"%s\" (relative to \"%s\").)", p_path, get_path()));
|
||||
if (unlikely(!node)) {
|
||||
if (p_path.is_absolute()) {
|
||||
ERR_FAIL_V_MSG(nullptr,
|
||||
vformat("(Node not found: \"%s\" (absolute path attempted from \"%s\").)", p_path, get_path()));
|
||||
} else {
|
||||
ERR_FAIL_V_MSG(nullptr,
|
||||
vformat("(Node not found: \"%s\" (relative to \"%s\").)", p_path, get_path()));
|
||||
}
|
||||
}
|
||||
|
||||
return node;
|
||||
|
|
Loading…
Reference in a new issue