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:
authorCampbell Barton <ideasman42@gmail.com>2013-12-28 12:34:50 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-12-28 12:34:50 +0400
commit1aa62605cdf7c43085c9d1db606b2c0c460e9897 (patch)
treeb34609a822591f9aead4522e789144cb5ea89459 /source/blender/blenkernel/intern/font.c
parent1a91b8bd5d6ad6a2a4fa62ae7719da01741849f4 (diff)
Fix for text3d issue, \n was attempting to find a character too
Diffstat (limited to 'source/blender/blenkernel/intern/font.c')
-rw-r--r--source/blender/blenkernel/intern/font.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 40da6e01d4c..608d5a72756 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -594,7 +594,7 @@ makebreak:
if (vfont == NULL) break;
- if (i != slen) {
+ if (!ELEM(ascii, '\n', '\0')) {
che = find_vfont_char(vfd, ascii);
/*
@@ -606,6 +606,9 @@ makebreak:
che = BLI_vfontchar_from_freetypefont(vfont, ascii);
}
}
+ else {
+ che = NULL;
+ }
/* No VFont found */
if (vfont == NULL) {