summaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-08-23 11:26:33 +0200
committerGitHub <noreply@github.com>2019-08-23 11:26:33 +0200
commit791d7f78b52f5b828aa5541897e12c6a1861ef6f (patch)
tree598b1a7f1b30e0cf47fc431be1f53768164ef19a /scene/resources
parentb7ba8a1fa1fbbf94c155c9d398ed591c395269c9 (diff)
parent08ceef2e390ade1800cee3a5c75f4194611f2bb7 (diff)
Merge pull request #31593 from SaracenOne/project_theme_shutdown_fix
Fixes issue with project_default_theme not being cleaned up
Diffstat (limited to 'scene/resources')
-rw-r--r--scene/resources/default_theme/default_theme.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 2664abdd2a..1a5f57ce48 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -893,8 +893,9 @@ void make_default_theme(bool p_hidpi, Ref<Font> p_font) {
void clear_default_theme() {
- Theme::set_default(Ref<Theme>());
- Theme::set_default_icon(Ref<Texture>());
- Theme::set_default_style(Ref<StyleBox>());
- Theme::set_default_font(Ref<Font>());
+ Theme::set_project_default(NULL);
+ Theme::set_default(NULL);
+ Theme::set_default_icon(NULL);
+ Theme::set_default_style(NULL);
+ Theme::set_default_font(NULL);
}