diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-02-18 14:18:24 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-02-18 14:18:24 +0100 |
| commit | e1c303fa79d53ac5f0a0568d70bd582bb354f20f (patch) | |
| tree | b14eb4dfc047b84aac699da200c26a1b866af2ef /core | |
| parent | 887d4bd0d985979d6c3fb33b053ce99486879956 (diff) | |
Revert "Fix extension registration order."
This reverts commit 94ef200bab8feb5024b2c64ac14daa24e0c4cc55.
This broke extension loading.
Fixes #58273.
Diffstat (limited to 'core')
| -rw-r--r-- | core/register_core_types.cpp | 4 | ||||
| -rw-r--r-- | core/register_core_types.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp index 7ebffdb459..a4b6a589f3 100644 --- a/core/register_core_types.cpp +++ b/core/register_core_types.cpp @@ -316,11 +316,9 @@ void register_core_extensions() { native_extension_manager->initialize_extensions(NativeExtension::INITIALIZATION_LEVEL_CORE); } -void unregister_core_extensions() { +void unregister_core_types() { native_extension_manager->deinitialize_extensions(NativeExtension::INITIALIZATION_LEVEL_CORE); -} -void unregister_core_types() { memdelete(native_extension_manager); memdelete(resource_uid); diff --git a/core/register_core_types.h b/core/register_core_types.h index dfb2d8ac80..0fd4e73c40 100644 --- a/core/register_core_types.h +++ b/core/register_core_types.h @@ -36,6 +36,5 @@ void register_core_settings(); void register_core_extensions(); void register_core_singletons(); void unregister_core_types(); -void unregister_core_extensions(); #endif // REGISTER_CORE_TYPES_H |