blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

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
This commit is contained in:
Harley Acheson 2020-10-20 18:50:55 -07:00
parent a80c1fc011
commit 4bf6ffc022
Notes: blender-bot 2023-02-14 09:03:55 +01:00 
Referenced by issue #81421, "Saving As..." a blend file with a Script node file path filled with 1023 symbols crashes Blender.
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenfont/BLF_api.h
View File

@ -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;

10
source/blender/blenfont/intern/blf.c
View File

@ -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);

2
source/blender/editors/space_view3d/view3d_draw.c
View File

@ -102,7 +102,7 @@
#define M_GOLDEN_RATIO_CONJUGATE 0.618033988749895f
#define VIEW3D_OVERLAY_LINEHEIGHT (int)(1.1f * BLF_default_height_max())
#define VIEW3D_OVERLAY_LINEHEIGHT (0.9f * U.widget_unit)
/* -------------------------------------------------------------------- */
/** \name General Functions