griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T80340: Crash with an empty text with Text on Curve

Browse Source 
Avoid divide by zero, based on D8780 by @lichtwerk.
This commit is contained in:
Campbell Barton
2020-09-03 12:37:24 +10:00
parent 7ff7a9c8fd
commit 2820f7be76
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/font.c
View File

@@ -1273,7 +1273,13 @@ static bool vfont_to_curve(Object *ob,
/* We put the x-coordinate exact at the curve, the y is rotated. */
/* length correction */
distfac = sizefac * cu->textoncurve->runtime.curve_cache->path->totdist / (maxx - minx);
float chartrans_size_x = maxx - minx;
if (UNLIKELY(chartrans_size_x == 0.0f)) {
/* Happens when there are no characters,
* the result isn't useful in this case, just avoid divide by zero. */
chartrans_size_x = 1.0f;
}
distfac = sizefac * cu->textoncurve->runtime.curve_cache->path->totdist / chartrans_size_x;
timeofs = 0.0f;
if (distfac > 1.0f) {
@@ -1294,7 +1300,7 @@ static bool vfont_to_curve(Object *ob,
distfac = 1.0;
}
distfac /= (maxx - minx);
distfac /= chartrans_size_x;
timeofs += distfac * cu->xof; /* not cyclic */