asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework Node::get_node to omit is_absolute() check in best case scenario

Browse source 
(cherry picked from commit e2792cc71c)
This commit is contained in:
Bartłomiej T. Listwon 2022-01-19 11:33:27 +01:00 committed by Rémi Verschelde
parent 96a325dec8
commit d3473b2a95
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scene/main/node.cpp
View file

@ -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(const NodePath &p_path) const {
Node *node = get_node_or_null(p_path); Node *node = get_node_or_null(p_path);
if (p_path.is_absolute()) { if (unlikely(!node)) {
ERR_FAIL_COND_V_MSG(!node, nullptr, if (p_path.is_absolute()) {
vformat("(Node not found: \"%s\" (absolute path attempted from \"%s\").)", p_path, get_path())); ERR_FAIL_V_MSG(nullptr,
} else { vformat("(Node not found: \"%s\" (absolute path attempted from \"%s\").)", p_path, get_path()));
ERR_FAIL_COND_V_MSG(!node, nullptr, } else {
vformat("(Node not found: \"%s\" (relative to \"%s\").)", p_path, get_path())); ERR_FAIL_V_MSG(nullptr,
vformat("(Node not found: \"%s\" (relative to \"%s\").)", p_path, get_path()));
}
} }
return node; return node;