diff options
| author | Yuri Sizov <yuris@humnom.net> | 2021-11-30 19:09:29 +0300 |
|---|---|---|
| committer | Yuri Sizov <yuris@humnom.net> | 2021-11-30 19:09:29 +0300 |
| commit | d567ce3582ab8e77127a3481170b06d3993611d8 (patch) | |
| tree | 9e8cd05c89f1325766ecbcf3b66fd572748b954f /scene | |
| parent | 2d118bd8b881fe9658e70eb8dc4fa7a6efac41a3 (diff) | |
Make default/project theme wait for modules before initializing
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/register_scene_types.cpp | 14 | ||||
| -rw-r--r-- | scene/register_scene_types.h | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 056ace5e4e..b1178b9263 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -1031,6 +1031,16 @@ void register_scene_types() { GLOBAL_DEF_BASIC(vformat("layer_names/3d_navigation/layer_%d", i + 1), ""); } + if (RenderingServer::get_singleton()) { + ColorPicker::init_shaders(); // RenderingServer needs to exist for this to succeed. + } + + SceneDebugger::initialize(); + + NativeExtensionManager::get_singleton()->initialize_extensions(NativeExtension::INITIALIZATION_LEVEL_SCENE); +} + +void initialize_theme() { bool default_theme_hidpi = GLOBAL_DEF("gui/theme/use_hidpi", false); ProjectSettings::get_singleton()->set_custom_property_info("gui/theme/use_hidpi", PropertyInfo(Variant::BOOL, "gui/theme/use_hidpi", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)); String theme_path = GLOBAL_DEF_RST("gui/theme/custom", ""); @@ -1049,7 +1059,6 @@ void register_scene_types() { // Always make the default theme to avoid invalid default font/icon/style in the given theme. if (RenderingServer::get_singleton()) { make_default_theme(default_theme_hidpi, font); - ColorPicker::init_shaders(); // RenderingServer needs to exist for this to succeed. } if (theme_path != String()) { @@ -1063,9 +1072,6 @@ void register_scene_types() { ERR_PRINT("Error loading custom theme '" + theme_path + "'"); } } - SceneDebugger::initialize(); - - NativeExtensionManager::get_singleton()->initialize_extensions(NativeExtension::INITIALIZATION_LEVEL_SCENE); } void unregister_scene_types() { diff --git a/scene/register_scene_types.h b/scene/register_scene_types.h index 1ff542eef8..32ab165fb3 100644 --- a/scene/register_scene_types.h +++ b/scene/register_scene_types.h @@ -34,4 +34,6 @@ void register_scene_types(); void unregister_scene_types(); +void initialize_theme(); + #endif |