Merge pull request #31593 from SaracenOne/project_theme_shutdown_fix

Fixes issue with project_default_theme not being cleaned up
godotengine · Aug 23, 2019 · 791d7f7 · 791d7f7
2 parents b7ba8a1 + 08ceef2
commit 791d7f7
Showing 1 changed file with 5 additions and 4 deletions.
diff --git 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);
 }