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

Merge pull request #43610 from RandomShaper/fix_res_duplicate

Browse Source 
Fix crash in resoure duplicate
This commit is contained in:
Rémi Verschelde 2020-11-17 11:21:53 +01:00 committed by GitHub
commit 386ee52978
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/io/resource.cpp
View File

@ -209,8 +209,8 @@ Ref<Resource> Resource::duplicate(bool p_subresources) const {
List<PropertyInfo> plist;
get_property_list(&plist);
Resource *r = (Resource *)ClassDB::instance(get_class());
ERR_FAIL_COND_V(!r, Ref<Resource>());
Ref<Resource> r = (Resource *)ClassDB::instance(get_class());
ERR_FAIL_COND_V(r.is_null(), Ref<Resource>());
for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) {
if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) {
@ -230,7 +230,7 @@ Ref<Resource> Resource::duplicate(bool p_subresources) const {
}
}
return Ref<Resource>(r);
return r;
}
void Resource::_set_path(const String &p_path) {