asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #43539 from zaevi/3.2_fix_loader_saver_broken

Browse source 
[3.2] Fix custom loader/savers broken
This commit is contained in:
Rémi Verschelde 2020-11-15 15:43:03 +01:00 committed by GitHub
commit aeb3557f94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/io/resource_loader.cpp
View file

@ -956,7 +956,7 @@ bool ResourceLoader::add_custom_resource_format_loader(String script_path) {
ERR_FAIL_COND_V_MSG(obj == NULL, false, "Cannot instance script as custom resource loader, expected 'ResourceFormatLoader' inheritance, got: " + String(ibt) + "."); ERR_FAIL_COND_V_MSG(obj == NULL, false, "Cannot instance script as custom resource loader, expected 'ResourceFormatLoader' inheritance, got: " + String(ibt) + ".");
ResourceFormatLoader *crl = Object::cast_to<ResourceFormatLoader>(obj); Ref<ResourceFormatLoader> crl = Object::cast_to<ResourceFormatLoader>(obj);
crl->set_script(s.get_ref_ptr()); crl->set_script(s.get_ref_ptr());
ResourceLoader::add_resource_format_loader(crl); ResourceLoader::add_resource_format_loader(crl);

2
core/io/resource_saver.cpp
View file

@ -220,7 +220,7 @@ bool ResourceSaver::add_custom_resource_format_saver(String script_path) {
ERR_FAIL_COND_V_MSG(obj == NULL, false, "Cannot instance script as custom resource saver, expected 'ResourceFormatSaver' inheritance, got: " + String(ibt) + "."); ERR_FAIL_COND_V_MSG(obj == NULL, false, "Cannot instance script as custom resource saver, expected 'ResourceFormatSaver' inheritance, got: " + String(ibt) + ".");
ResourceFormatSaver *crl = Object::cast_to<ResourceFormatSaver>(obj); Ref<ResourceFormatSaver> crl = Object::cast_to<ResourceFormatSaver>(obj);
crl->set_script(s.get_ref_ptr()); crl->set_script(s.get_ref_ptr());
ResourceSaver::add_resource_format_saver(crl); ResourceSaver::add_resource_format_saver(crl);