Skip to content

Commit 0a5a6e9

Browse files
committed
Merge pull request #106381 from bruvzg/br_font
Skip default font loading if Brotli is disabled.
2 parents 35ac3c0 + 50c0556 commit 0a5a6e9

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

scene/theme/default_theme.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
#include "default_theme.h"
3232

3333
#include "core/io/image.h"
34-
#include "default_font.gen.h"
35-
#include "default_theme_icons.gen.h"
3634
#include "scene/resources/font.h"
3735
#include "scene/resources/gradient_texture.h"
3836
#include "scene/resources/image_texture.h"
@@ -41,9 +39,14 @@
4139
#include "scene/resources/svg_texture.h"
4240
#include "scene/resources/theme.h"
4341
#include "scene/scene_string_names.h"
42+
#include "scene/theme/default_theme_icons.gen.h"
4443
#include "scene/theme/theme_db.h"
4544
#include "servers/text_server.h"
4645

46+
#ifdef BROTLI_ENABLED
47+
#include "scene/theme/default_font.gen.h"
48+
#endif
49+
4750
static const int default_font_size = 16;
4851

4952
static float scale = 1.0;
@@ -1314,13 +1317,14 @@ void make_default_theme(float p_scale, Ref<Font> p_font, TextServer::SubpixelPos
13141317
// embedded in both editor and export template binaries.
13151318
Ref<FontFile> dynamic_font;
13161319
dynamic_font.instantiate();
1320+
#ifdef BROTLI_ENABLED
13171321
dynamic_font->set_data_ptr(_font_OpenSans_SemiBold, _font_OpenSans_SemiBold_size);
13181322
dynamic_font->set_subpixel_positioning(p_font_subpixel);
13191323
dynamic_font->set_hinting(p_font_hinting);
13201324
dynamic_font->set_antialiasing(p_font_antialiasing);
13211325
dynamic_font->set_multichannel_signed_distance_field(p_font_msdf);
13221326
dynamic_font->set_generate_mipmaps(p_font_generate_mipmaps);
1323-
1327+
#endif
13241328
default_font = dynamic_font;
13251329
}
13261330

0 commit comments

Comments
 (0)