diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-10 12:45:57 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-10 12:45:57 +0100 |
| commit | e5f1d19352dbaafab96538b91fad0ce11cf0d046 (patch) | |
| tree | c3cf72310e91ced0bd739b61d1d3197df78c1313 /modules/gdnative/register_types.cpp | |
| parent | 940a2c5ec3e13d57c6462b7070eb3101766c91db (diff) | |
| download | redot-engine-e5f1d19352dbaafab96538b91fad0ce11cf0d046.tar.gz | |
Consistency in resource format saver/loader de-registration
Some used 'is_valid()' checks, others not. Validity is already checked in 'unref()',
and 'remove_resource_format_*()' has an ERR_FAIL condition on 'is_null()' already
(which shouldn't happen since we're only unregistering things that we previously
registered.
Also add missing GDCLASS statement in ResourceFormatLoaderVideoStreamGDNative,
missed in #20552 which was last amended before #19501 was merged.
Diffstat (limited to 'modules/gdnative/register_types.cpp')
| -rw-r--r-- | modules/gdnative/register_types.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/gdnative/register_types.cpp b/modules/gdnative/register_types.cpp index 21343214c1..b38de75caa 100644 --- a/modules/gdnative/register_types.cpp +++ b/modules/gdnative/register_types.cpp @@ -314,9 +314,9 @@ void register_gdnative_types() { ClassDB::register_class<GDNative>(); resource_loader_gdnlib.instance(); - resource_saver_gdnlib.instance(); - ResourceLoader::add_resource_format_loader(resource_loader_gdnlib); + + resource_saver_gdnlib.instance(); ResourceSaver::add_resource_format_saver(resource_saver_gdnlib); GDNativeCallRegistry::singleton = memnew(GDNativeCallRegistry); @@ -395,9 +395,9 @@ void unregister_gdnative_types() { #endif ResourceLoader::remove_resource_format_loader(resource_loader_gdnlib); - ResourceSaver::remove_resource_format_saver(resource_saver_gdnlib); - resource_loader_gdnlib.unref(); + + ResourceSaver::remove_resource_format_saver(resource_saver_gdnlib); resource_saver_gdnlib.unref(); // This is for printing out the sizes of the core types |