diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-05-09 19:28:54 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-05-09 19:28:54 +0200 |
commit | 6bca6beea3e1212ad1eb22ffe8630ea25c7e92c2 (patch) | |
tree | f8bd79189341d30e34fd2eac578c4e6c5c086140 /modules | |
parent | f20061d2d91ee8150082026a43e20dafd78cffa4 (diff) | |
parent | 8e7afec479b29bfe7f6d33ca9bce70c9d1abf7cf (diff) | |
download | redot-engine-6bca6beea3e1212ad1eb22ffe8630ea25c7e92c2.tar.gz |
Merge pull request #76878 from RedworkDE/tests-fix-errors
Fix various errors when running the unit tests
Diffstat (limited to 'modules')
-rw-r--r-- | modules/text_server_fb/text_server_fb.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/text_server_fb/text_server_fb.cpp b/modules/text_server_fb/text_server_fb.cpp index 8b210bdc38..b76214cf94 100644 --- a/modules/text_server_fb/text_server_fb.cpp +++ b/modules/text_server_fb/text_server_fb.cpp @@ -3865,8 +3865,8 @@ bool TextServerFallback::_shaped_text_shape(const RID &p_shaped) { } prev_font = gl.font_rid; - double scale = _font_get_scale(gl.font_rid, gl.font_size); if (gl.font_rid.is_valid()) { + double scale = _font_get_scale(gl.font_rid, gl.font_size); bool subpos = (scale != 1.0) || (_font_get_subpixel_positioning(gl.font_rid) == SUBPIXEL_POSITIONING_ONE_HALF) || (_font_get_subpixel_positioning(gl.font_rid) == SUBPIXEL_POSITIONING_ONE_QUARTER) || (_font_get_subpixel_positioning(gl.font_rid) == SUBPIXEL_POSITIONING_AUTO && gl.font_size <= SUBPIXEL_POSITIONING_ONE_HALF_MAX_SIZE); if (sd->text[j - sd->start] != 0 && !is_linebreak(sd->text[j - sd->start])) { if (sd->orientation == ORIENTATION_HORIZONTAL) { |