From bd0a9f4bd607a324eb2220502a506abad5f33c10 Mon Sep 17 00:00:00 2001
From: geequlim <geequlim@gmail.com>
Date: Sat, 30 Dec 2017 16:11:00 +0800
Subject: Fix errors with custom default theme and custom fonts.

---
 scene/resources/default_theme/default_theme.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scene/resources')

diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index f4e6c5e247..40ff582732 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -880,7 +880,7 @@ void make_default_theme(bool p_hidpi, Ref<Font> p_font) {
 
 	Ref<StyleBox> default_style;
 	Ref<Texture> default_icon;
-	Ref<BitmapFont> default_font;
+	Ref<Font> default_font;
 	if (p_font.is_valid()) {
 		default_font = p_font;
 	} else if (p_hidpi) {
@@ -888,7 +888,7 @@ void make_default_theme(bool p_hidpi, Ref<Font> p_font) {
 	} else {
 		default_font = make_font2(_lodpi_font_height, _lodpi_font_ascent, _lodpi_font_charcount, &_lodpi_font_charrects[0][0], _lodpi_font_kerning_pair_count, &_lodpi_font_kerning_pairs[0][0], _lodpi_font_img_width, _lodpi_font_img_height, _lodpi_font_img_data);
 	}
-	Ref<BitmapFont> large_font = default_font;
+	Ref<Font> large_font = default_font;
 	fill_default_theme(t, default_font, large_font, default_icon, default_style, p_hidpi ? 2.0 : 1.0);
 
 	Theme::set_default(t);
-- 
cgit v1.2.3