Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-25 21:52:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #95529 from bruvzg/bmfont_match_h

Browse Source 
[BMFont] Fix importing fonts with `Match char height` enabled.
This commit is contained in:
Rémi Verschelde 2024-08-16 14:35:32 +02:00
commit a778f7803c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scene/resources/font.cpp
View File

@ -1482,8 +1482,8 @@ Error FontFile::_load_bitmap_font(const String &p_path, List<String> *r_image_fi
switch (block_type) {
case 1: /* info */ {
ERR_FAIL_COND_V_MSG(block_size < 15, ERR_CANT_CREATE, "Invalid BMFont info block size.");
base_size = f->get_16();
if (base_size <= 0) {
base_size = ABS(static_cast<int16_t>(f->get_16()));
if (base_size == 0) {
base_size = 16;
}
uint8_t flags = f->get_8();
@ -1776,7 +1776,10 @@ Error FontFile::_load_bitmap_font(const String &p_path, List<String> *r_image_fi
if (type == "info") {
if (keys.has("size")) {
base_size = keys["size"].to_int();
base_size = ABS(keys["size"].to_int());
if (base_size == 0) {
base_size = 16;
}
}
if (keys.has("outline")) {
outline = keys["outline"].to_int();