godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #79166 from bruvzg/ts_dict_chk 

[TextServer] Remove excessive Dictionary checks.
This commit is contained in:
Yuri Sizov 2023-09-05 15:14:14 +02:00
parent e7208420bc 31a8a9b2e1
commit c9bf824124
3 changed files with 8 additions and 16 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

@ -2383,11 +2383,9 @@ void TextServerAdvanced::_font_set_variation_coordinates(const RID &p_font_rid,
ERR_FAIL_COND(!fd);
MutexLock lock(fd->mutex);
if (fd->variation_coordinates != p_variation_coordinates) {
_font_clear_cache(fd);
fd->variation_coordinates = p_variation_coordinates;
}
}
Dictionary TextServerAdvanced::_font_get_variation_coordinates(const RID &p_font_rid) const {
FontAdvanced *fd = font_owner.get_or_null(p_font_rid);

2
modules/text_server_fb/text_server_fb.cpp
View File

@ -1376,11 +1376,9 @@ void TextServerFallback::_font_set_variation_coordinates(const RID &p_font_rid,
ERR_FAIL_COND(!fd);
MutexLock lock(fd->mutex);
if (fd->variation_coordinates != p_variation_coordinates) {
_font_clear_cache(fd);
fd->variation_coordinates = p_variation_coordinates;
}
}
Dictionary TextServerFallback::_font_get_variation_coordinates(const RID &p_font_rid) const {
FontFallback *fd = font_owner.get_or_null(p_font_rid);

4
scene/resources/font.cpp
View File

@ -2833,11 +2833,9 @@ Ref<Font> FontVariation::_get_base_font_or_default() const {
}
void FontVariation::set_variation_opentype(const Dictionary &p_coords) {
if (variation.opentype != p_coords) {
variation.opentype = p_coords;
_invalidate_rids();
}
}
Dictionary FontVariation::get_variation_opentype() const {
return variation.opentype;
@ -2877,11 +2875,9 @@ int FontVariation::get_variation_face_index() const {
}
void FontVariation::set_opentype_features(const Dictionary &p_features) {
if (opentype_features != p_features) {
opentype_features = p_features;
_invalidate_rids();
}
}
Dictionary FontVariation::get_opentype_features() const {
return opentype_features;