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

6
modules/text_server_adv/text_server_adv.cpp
View File

@ -2383,10 +2383,8 @@ 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;
}
_font_clear_cache(fd);
fd->variation_coordinates = p_variation_coordinates;
}
Dictionary TextServerAdvanced::_font_get_variation_coordinates(const RID &p_font_rid) const {

6
modules/text_server_fb/text_server_fb.cpp
View File

@ -1376,10 +1376,8 @@ 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;
}
_font_clear_cache(fd);
fd->variation_coordinates = p_variation_coordinates;
}
Dictionary TextServerFallback::_font_get_variation_coordinates(const RID &p_font_rid) const {

12
scene/resources/font.cpp
View File

@ -2833,10 +2833,8 @@ 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();
}
variation.opentype = p_coords;
_invalidate_rids();
}
Dictionary FontVariation::get_variation_opentype() const {
@ -2877,10 +2875,8 @@ 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();
}
opentype_features = p_features;
_invalidate_rids();
}
Dictionary FontVariation::get_opentype_features() const {