asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #69857 from bruvzg/bim_font_no_clean

Browse source 
[TextServer] Do not clean up font texture cache when setting `allow_system_fallback` property.
This commit is contained in:
Rémi Verschelde 2022-12-10 22:09:04 +01:00 committed by GitHub
commit a4131b61b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/text_server_adv/text_server_adv.cpp
View file

@ -2151,10 +2151,7 @@ void TextServerAdvanced::_font_set_allow_system_fallback(const RID &p_font_rid,
ERR_FAIL_COND(!fd);
MutexLock lock(fd->mutex);
if (fd->allow_system_fallback != p_allow_system_fallback) {
_font_clear_cache(fd);
fd->allow_system_fallback = p_allow_system_fallback;
}
fd->allow_system_fallback = p_allow_system_fallback;
}
bool TextServerAdvanced::_font_is_allow_system_fallback(const RID &p_font_rid) const {

5
modules/text_server_fb/text_server_fb.cpp
View file

@ -1246,10 +1246,7 @@ void TextServerFallback::_font_set_allow_system_fallback(const RID &p_font_rid,
ERR_FAIL_COND(!fd);
MutexLock lock(fd->mutex);
if (fd->allow_system_fallback != p_allow_system_fallback) {
_font_clear_cache(fd);
fd->allow_system_fallback = p_allow_system_fallback;
}
fd->allow_system_fallback = p_allow_system_fallback;
}
bool TextServerFallback::_font_is_allow_system_fallback(const RID &p_font_rid) const {