[Bf-blender-cvs] [46c3ef57156] blender-v2.83-release: Fix mistake in recent fix for text editor overflow
Campbell Barton
noreply at git.blender.org
Wed Jul 29 10:53:11 CEST 2020
Commit: 46c3ef571566a531b94dfac121f10ca084f0aa65
Author: Campbell Barton
Date: Tue Jun 9 17:39:43 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rB46c3ef571566a531b94dfac121f10ca084f0aa65
Fix mistake in recent fix for text editor overflow
===================================================================
M source/blender/blenkernel/intern/font.c
===================================================================
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 5b45a916834..b0bc5cf7e0f 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -1501,7 +1501,7 @@ static bool vfont_to_curve(Object *ob,
}
else if (tb_scale.h == 0.0f) {
/* This is a horizontal overflow. */
- if (longest_line_length > 0.0f) {
+ if (longest_line_length > tb_scale.w) {
/* We make sure longest line before it broke can fit here. */
float scale_to_fit = tb_scale.w / longest_line_length;
scale_to_fit -= FLT_EPSILON;
More information about the Bf-blender-cvs
mailing list