From e1c303fa79d53ac5f0a0568d70bd582bb354f20f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 18 Feb 2022 14:18:24 +0100 Subject: Revert "Fix extension registration order." This reverts commit 94ef200bab8feb5024b2c64ac14daa24e0c4cc55. This broke extension loading. Fixes #58273. --- core/register_core_types.cpp | 4 +--- core/register_core_types.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'core') 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 -- cgit v1.2.3