[Bf-blender-cvs] [8356318] temp-blf-wordwrap: Fix error drawing trailing newline
Campbell Barton
noreply at git.blender.org
Thu Sep 17 19:50:04 CEST 2015
Commit: 83563189a1529aca45f4d1438fe15b62aae79756
Author: Campbell Barton
Date: Fri Sep 18 03:43:45 2015 +1000
Branches: temp-blf-wordwrap
https://developer.blender.org/rB83563189a1529aca45f4d1438fe15b62aae79756
Fix error drawing trailing newline
===================================================================
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 0aef7ac..fb9051e 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -710,7 +710,8 @@ static void blf_font_wrap_apply(
do_draw = true;
}
else if (UNLIKELY(((i < len) && str[i]) == 0)) {
- wrap.last[0] = i + 1;
+ /* need check here for trailing newline, else we draw it */
+ wrap.last[0] = i + ((g->c != '\n') ? 1 : 0);
wrap.last[1] = i;
do_draw = true;
}
More information about the Bf-blender-cvs
mailing list