[Bf-blender-cvs] [8a379e3] master: 3D Text: avoid checking null character's text on path
Campbell Barton
noreply at git.blender.org
Thu Apr 28 07:54:28 CEST 2016
Commit: 8a379e3460048906306042145052d5d7f3bb859c
Author: Campbell Barton
Date: Thu Apr 28 15:56:41 2016 +1000
Branches: master
https://developer.blender.org/rB8a379e3460048906306042145052d5d7f3bb859c
3D Text: avoid checking null character's text on path
Redundant and causes complications when improving text code.
===================================================================
M source/blender/blenkernel/intern/font.c
===================================================================
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 0a887dc..aed33d2 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -1040,7 +1040,7 @@ makebreak:
timeofs += distfac * cu->xof; /* not cyclic */
ct = chartransdata;
- for (i = 0; i <= slen; i++, ct++) {
+ for (i = 0; i < slen; i++, ct++) {
float ctime, dtime, vec[4], tvec[4], rotvec[3];
float si, co;
@@ -1082,8 +1082,9 @@ makebreak:
sb = &selboxes[i - selstart];
sb->rot = -ct->rot;
}
-
}
+ /* null character is always zero width, no need to iterate over it */
+ chartransdata[slen] = chartransdata[slen - 1];
}
}
More information about the Bf-blender-cvs
mailing list