Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarley Acheson <harley.acheson@gmail.com>2020-10-21 04:50:55 +0300
committerHarley Acheson <harley.acheson@gmail.com>2020-10-21 05:11:36 +0300
commit4bf6ffc022fdaea88f5289dfe085029df53bb95b (patch)
tree9cb8801745d5fa7fb96af085df35dc680315bb7a /source/blender/blenfont
parenta80c1fc011795f4e8461210535e4fd0526b39044 (diff)
Fix for T81757: Incorrect Overlay Line Height
Fixes error in determining 3DView Overlay Line Height. Do not base on current default font height. Differential Revision: https://developer.blender.org/D9288 Reviewed by Campbell Barton
Diffstat (limited to 'source/blender/blenfont')
-rw-r--r--source/blender/blenfont/BLF_api.h5
-rw-r--r--source/blender/blenfont/intern/blf.c10
2 files changed, 0 insertions, 15 deletions
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index 17a650e28f5..bf84f5c57b3 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -163,13 +163,8 @@ float BLF_height_ex(int fontid, const char *str, size_t len, struct ResultBLF *r
float BLF_height(int fontid, const char *str, size_t len) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
/* Return dimensions of the font without any sample text. */
-
int BLF_height_max(int fontid) ATTR_WARN_UNUSED_RESULT;
-int BLF_default_height_max(void) ATTR_WARN_UNUSED_RESULT;
-
float BLF_width_max(int fontid) ATTR_WARN_UNUSED_RESULT;
-float BLF_default_width_max(void) ATTR_WARN_UNUSED_RESULT;
-
float BLF_descender(int fontid) ATTR_WARN_UNUSED_RESULT;
float BLF_ascender(int fontid) ATTR_WARN_UNUSED_RESULT;
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 76ff498f5c2..c8940add738 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -824,11 +824,6 @@ int BLF_height_max(int fontid)
return 0;
}
-int BLF_default_height_max(void)
-{
- return BLF_height_max(global_font_default);
-}
-
float BLF_width_max(int fontid)
{
FontBLF *font = blf_get(fontid);
@@ -840,11 +835,6 @@ float BLF_width_max(int fontid)
return 0.0f;
}
-float BLF_default_width_max(void)
-{
- return BLF_width_max(global_font_default);
-}
-
float BLF_descender(int fontid)
{
FontBLF *font = blf_get(fontid);