godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Fix crash duplicating local-to-scene resources

Browse Source 
(cherry picked from commit e99cf6bfe5)
This commit is contained in:
Pedro J. Estébanez
2020-11-18 23:45:30 +01:00
committed by Rémi Verschelde
parent 32017b1490
commit ebdcf1cc60
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/resource.cpp
View File

@@ -155,8 +155,8 @@ Ref<Resource> Resource::duplicate_for_local_scene(Node *p_for_scene, Map<Ref<Res
List<PropertyInfo> plist; List<PropertyInfo> plist;
get_property_list(&plist); get_property_list(&plist);
Resource *r = Object::cast_to<Resource>(ClassDB::instance(get_class())); Ref<Resource> r = Object::cast_to<Resource>(ClassDB::instance(get_class()));
ERR_FAIL_COND_V(!r, Ref<Resource>()); ERR_FAIL_COND_V(r.is_null(), Ref<Resource>());
r->local_scene = p_for_scene; r->local_scene = p_for_scene;
@@ -186,9 +186,7 @@ Ref<Resource> Resource::duplicate_for_local_scene(Node *p_for_scene, Map<Ref<Res
r->set(E->get().name, p); r->set(E->get().name, p);
} }
RES res = Ref<Resource>(r); return r;
return res;
} }
void Resource::configure_for_local_scene(Node *p_for_scene, Map<Ref<Resource>, Ref<Resource> > &remap_cache) { void Resource::configure_for_local_scene(Node *p_for_scene, Map<Ref<Resource>, Ref<Resource> > &remap_cache) {