diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-18 08:12:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-18 08:12:56 +0200 |
| commit | 1a92906b681735a5a2acfd98e3d6a4c75a7f6115 (patch) | |
| tree | f01757ba9a3b618df7da54b0698134b1a9f03e3f /scene | |
| parent | 3a4ff3402dedab5f30b0f97aeadec6cf61f29a40 (diff) | |
| parent | eab850524ead092ed9fe22e57955e59eae373b79 (diff) | |
Merge pull request #10406 from marcelofg55/closest_power_of_2
Add closest_power_of_2 func and implement mix_rate/latency on OS X
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/resources/dynamic_font.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/dynamic_font_stb.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/dynamic_font.cpp b/scene/resources/dynamic_font.cpp index fc0d80a9b7..e424ee48a8 100644 --- a/scene/resources/dynamic_font.cpp +++ b/scene/resources/dynamic_font.cpp @@ -524,7 +524,7 @@ void DynamicFontAtSize::_update_char(CharType p_char) { if (mh > texsize) texsize = mh; //special case, adapt to it? - texsize = nearest_power_of_2(texsize); + texsize = next_power_of_2(texsize); texsize = MIN(texsize, 4096); diff --git a/scene/resources/dynamic_font_stb.cpp b/scene/resources/dynamic_font_stb.cpp index 8efad94b9a..fa8cf4723b 100644 --- a/scene/resources/dynamic_font_stb.cpp +++ b/scene/resources/dynamic_font_stb.cpp @@ -289,7 +289,7 @@ void DynamicFontAtSize::_update_char(CharType p_char) { if (mh > texsize) texsize = mh; //special case, adapt to it? - texsize = nearest_power_of_2(texsize); + texsize = next_power_of_2(texsize); texsize = MIN(texsize, 4096); |