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>2021-09-15 04:13:10 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-09-15 04:15:00 +0300
commit56f8d7c7059728bad0fe087c291e4829398eab16 (patch)
tree54283e71dccbb3f663f7289b986ae0816503accb
parente1714ce8c90974f563d5071e4a67a249e7626fb3 (diff)
Fix T89241: Scale to fit overflows into a second line
-rw-r--r--source/blender/blenkernel/intern/font.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index c1765967238..b6e374d158f 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -719,6 +719,9 @@ typedef struct VFontToCurveIter {
*
* 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;
@@ -1640,7 +1643,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;
}
}
}