noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #52134 from RandomShaper/fix_naming

Browse Source
This commit is contained in:
Rémi Verschelde
2022-01-20 22:01:37 +01:00
committed by GitHub
parent 04d283dc23 7b0ed2aa5e
commit d681d99e12
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scene/main/node.cpp
+2 -2
View File
@@ -2188,7 +2188,7 @@ void Node::remap_node_resources(Node *p_node, const Map<RES, RES> &p_resource_re
}
Variant v = p_node->get(E.name);
if (v.is_ref()) {
if (v.is_ref_counted()) {
RES res = v;
if (res.is_valid()) {
if (p_resource_remap.has(res)) {
@@ -2214,7 +2214,7 @@ void Node::remap_nested_resources(RES p_resource, const Map<RES, RES> &p_resourc
}
Variant v = p_resource->get(E.name);
if (v.is_ref()) {
if (v.is_ref_counted()) {
RES res = v;
if (res.is_valid()) {
if (p_resource_remap.has(res)) {