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

Merge pull request #61095 from BimDav/get_node_and_resource

Browse Source 
Fix a bug in get_node_and_resource when the property is set to null
This commit is contained in:
Rémi Verschelde 2022-05-18 15:19:17 +02:00 committed by GitHub
commit 2f3a8a3d61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/main/node.cpp
View File

@ -2528,9 +2528,10 @@ Node *Node::get_node_and_resource(const NodePath &p_path, Ref<Resource> &r_res,
int j = 0; int j = 0;
// If not p_last_is_property, we shouldn't consider the last one as part of the resource // If not p_last_is_property, we shouldn't consider the last one as part of the resource
for (; j < p_path.get_subname_count() - (int)p_last_is_property; j++) { for (; j < p_path.get_subname_count() - (int)p_last_is_property; j++) {
Variant new_res_v = j == 0 ? node->get(p_path.get_subname(j)) : r_res->get(p_path.get_subname(j)); bool is_valid = false;
Variant new_res_v = j == 0 ? node->get(p_path.get_subname(j), &is_valid) : r_res->get(p_path.get_subname(j), &is_valid);
if (new_res_v.get_type() == Variant::NIL) { // Found nothing on that path if (!is_valid) { // Found nothing on that path
return nullptr; return nullptr;
} }