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

4
editor/scene_tree_dock.cpp
View File

@@ -3214,7 +3214,7 @@ void SceneTreeDock::_create_remap_for_node(Node *p_node, Map<RES, RES> &r_remap)
}
Variant v = p_node->get(E.name);
if (v.is_ref()) {
if (v.is_ref_counted()) {
RES res = v;
if (res.is_valid()) {
if (!states_stack_ready) {
@@ -3252,7 +3252,7 @@ void SceneTreeDock::_create_remap_for_resource(RES p_resource, Map<RES, RES> &r_
}
Variant v = p_resource->get(E.name);
if (v.is_ref()) {
if (v.is_ref_counted()) {
RES res = v;
if (res.is_valid()) {
if (res->is_built_in() && !r_remap.has(res)) {