maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #30498 from bojidar-bg/30495-cannot-insert-key

Browse source 
Fix inability to insert keys via Insert Key context menu
This commit is contained in:
Rémi Verschelde 2019-07-11 19:36:33 +02:00 committed by GitHub
parent e5c6ebbd36 8ecbb6a20d
commit 111154a4a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scene/main/node.cpp
View file

@ -2487,7 +2487,7 @@ bool Node::has_node_and_resource(const NodePath &p_path) const {
Vector<StringName> leftover_path;
Node *node = get_node_and_resource(p_path, res, leftover_path, false);
return (node && res.is_valid());
return node;
}
Array Node::_get_node_and_resource(const NodePath &p_path) {
@ -2525,9 +2525,15 @@ Node *Node::get_node_and_resource(const NodePath &p_path, RES &r_res, Vector<Str
int j = 0;
// 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++) {
RES new_res = j == 0 ? node->get(p_path.get_subname(j)) : r_res->get(p_path.get_subname(j));
Variant new_res_v = j == 0 ? node->get(p_path.get_subname(j)) : r_res->get(p_path.get_subname(j));
if (new_res.is_null()) {
if (new_res_v.get_type() == Variant::NIL) { // Found nothing on that path
return NULL;
}
RES new_res = new_res_v;
if (new_res.is_null()) { // No longer a resource, assume property
break;
}