[Bf-blender-cvs] [4db4123409d] master: Correct assert from 22ab0159a9754365e2d10a1bc658d4409d084fa6
Campbell Barton
noreply at git.blender.org
Thu Aug 19 09:56:51 CEST 2021
Commit: 4db4123409de6f42a519cd03275d680b3d821298
Author: Campbell Barton
Date: Thu Aug 19 17:55:40 2021 +1000
Branches: master
https://developer.blender.org/rB4db4123409de6f42a519cd03275d680b3d821298
Correct assert from 22ab0159a9754365e2d10a1bc658d4409d084fa6
===================================================================
M source/blender/blenfont/intern/blf_font.c
===================================================================
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index 9ddc788d2dc..00d3cfb09eb 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -356,7 +356,7 @@ BLI_INLINE void blf_kerning_step_fast(FontBLF *font,
int *pen_x_p)
{
/* `blf_font_ensure_ascii_kerning(font, gc);` must be called before this function. */
- BLI_assert(font->kerning_cache != NULL);
+ BLI_assert(font->kerning_cache != NULL || !FT_HAS_KERNING(font->face));
if (g_prev != NULL && FT_HAS_KERNING(font->face)) {
if ((c_prev < KERNING_CACHE_TABLE_SIZE) && (c < GLYPH_ASCII_TABLE_SIZE)) {
More information about the Bf-blender-cvs
mailing list