Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Merge pull request #74212 from bruvzg/bmp_def_out 

[Bitmap font] Assume outline size is `1` if it's not set, but channel for outline is defined.
4.1
Rémi Verschelde 2023-03-03 11:07:28 +07:00
parent 326c0f324a 67762ec4a6
commit a2d449f22e
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/resources/font.cpp
Unescape Escape View File

@ -1458,6 +1458,9 @@ Error FontFile::load_bitmap_font(const String &p_path) {
}
if (ch[i] == 1 && first_ol_ch == -1) {
first_ol_ch = i;
if (outline == 0) {
outline = 1;
}
}
if (ch[i] == 2 && first_cm_ch == -1) {
first_cm_ch = i;
@ -1747,6 +1750,9 @@ Error FontFile::load_bitmap_font(const String &p_path) {
}
if (ch[i] == 1 && first_ol_ch == -1) {
first_ol_ch = i;
if (outline == 0) {
outline = 1;
}
}
if (ch[i] == 2 && first_cm_ch == -1) {
first_cm_ch = i;