[Bf-blender-cvs] [a08d039] master: Fix assigning flag to bool

Campbell Barton noreply at git.blender.org
Fri Aug 28 17:10:48 CEST 2015


Commit: a08d039e5958ce490741db90768c5698dd1dec0f
Author: Campbell Barton
Date:   Sat Aug 29 00:21:18 2015 +1000
Branches: master
https://developer.blender.org/rBa08d039e5958ce490741db90768c5698dd1dec0f

Fix assigning flag to bool

===================================================================

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 2057b0f..46e0e0e 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -153,7 +153,7 @@ static void blf_font_ensure_ascii_table(FontBLF *font)
 
 
 #define BLF_KERNING_VARS(_font, _has_kerning, _kern_mode)                        \
-	const bool _has_kerning = FT_HAS_KERNING((_font)->face);                     \
+	const bool _has_kerning = FT_HAS_KERNING((_font)->face) != 0;                \
 	const FT_UInt _kern_mode = (_has_kerning == 0) ? 0 :                         \
 	                         (((_font)->flags & BLF_KERNING_DEFAULT) ?           \
 	                          ft_kerning_default : (FT_UInt)FT_KERNING_UNFITTED) \




More information about the Bf-blender-cvs mailing list