blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix T89241: Scale to fit overflows into a second line

This commit is contained in:
Campbell Barton 2021-09-15 11:13:10 +10:00 committed by Jeroen Bakker
parent 597d9518ef
commit e90aabdebf
Notes: blender-bot 2023-02-14 10:21:10 +01:00 
Referenced by issue #88449: Blender LTS: Maintenance Task 2.93
Referenced by issue #88449, Blender LTS: Maintenance Task 2.93
Referenced by issue #89241, Scale to Fit overflows into a second line
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -716,8 +716,13 @@ typedef struct VFontToCurveIter {
} bisect;
bool ok;
/**
* Disables checking if word wrapping is needed to fit the text-box width.
* Currently only used when scale-to-fit is enabled.
* Wrap words that extends beyond the text-box width (enabled by default).
*
* Currently only disabled when scale-to-fit is enabled,
* so floating-point error doesn't cause unexpected wrapping, see T89241.
*
* \note This should only be set once, in the #VFONT_TO_CURVE_INIT pass
* otherwise iterations wont behave predictably, see T89241.
*/
bool word_wrap;
int status;
@ -1639,7 +1644,6 @@ static bool vfont_to_curve(Object *ob,
else {
iter_data->scale_to_fit = iter_data->bisect.min;
iter_data->status = VFONT_TO_CURVE_SCALE_ONCE;
iter_data->word_wrap = false;
}
}
}