Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-24 02:40:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #64744 from bruvzg/fix_mixed_font_color4

Browse Source 
[4.x] Fix color modulation of the grayscale glyphs in font with mixed color / grayscale data.
This commit is contained in:
Rémi Verschelde 2022-08-23 07:45:58 +02:00 committed by GitHub
commit 230225d360
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/text_server_adv/text_server_adv.cpp
View File

@ -3065,7 +3065,7 @@ void TextServerAdvanced::font_draw_glyph(const RID &p_font_rid, const RID &p_can
if (gl.texture_idx != -1) { if (gl.texture_idx != -1) {
Color modulate = p_color; Color modulate = p_color;
#ifdef MODULE_FREETYPE_ENABLED #ifdef MODULE_FREETYPE_ENABLED
if (fd->cache[size]->face && FT_HAS_COLOR(fd->cache[size]->face)) { if (fd->cache[size]->face && fd->cache[size]->textures[gl.texture_idx].format == Image::FORMAT_RGBA8) {
modulate.r = modulate.g = modulate.b = 1.0; modulate.r = modulate.g = modulate.b = 1.0;
} }
#endif #endif

2
modules/text_server_fb/text_server_fb.cpp
View File

@ -2122,7 +2122,7 @@ void TextServerFallback::font_draw_glyph(const RID &p_font_rid, const RID &p_can
if (gl.texture_idx != -1) { if (gl.texture_idx != -1) {
Color modulate = p_color; Color modulate = p_color;
#ifdef MODULE_FREETYPE_ENABLED #ifdef MODULE_FREETYPE_ENABLED
if (fd->cache[size]->face && FT_HAS_COLOR(fd->cache[size]->face)) { if (fd->cache[size]->face && fd->cache[size]->textures[gl.texture_idx].format == Image::FORMAT_RGBA8) {
modulate.r = modulate.g = modulate.b = 1.0; modulate.r = modulate.g = modulate.b = 1.0;
} }
#endif #endif