Merge pull request #55483 from pycbouh/theme-load-and-order

1 files changed, 6 insertions, 0 deletions

diff --git a/main/main.cpp b/main/main.cpp
index e760c930f2..c7b33f3f1b 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -444,6 +444,9 @@ Error Main::test_setup() {
 	register_module_types();
 	register_driver_types();
 
+	// Theme needs modules to be initialized so that sub-resources can be loaded.
+	initialize_theme();
+
 	ERR_FAIL_COND_V(TextServerManager::get_singleton()->get_interface_count() == 0, ERR_CANT_CREATE);
 	TextServerManager::get_singleton()->set_primary_interface(TextServerManager::get_singleton()->get_interface(0));
 
@@ -1884,6 +1887,9 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
 	register_platform_apis();
 	register_module_types();
 
+	// Theme needs modules to be initialized so that sub-resources can be loaded.
+	initialize_theme();
+
 	GLOBAL_DEF("display/mouse_cursor/custom_image", String());
 	GLOBAL_DEF("display/mouse_cursor/custom_image_hotspot", Vector2());
 	GLOBAL_DEF("display/mouse_cursor/tooltip_position_offset", Point2(10, 10));