[Bf-blender-cvs] [3225261] master: Fix incorrect textbox use w/ scaled fonts

Campbell Barton noreply at git.blender.org
Thu Sep 10 06:18:32 CEST 2015


Commit: 3225261f131fa3b0eb4a2bfc181945ee74bca794
Author: Campbell Barton
Date:   Thu Sep 10 14:07:37 2015 +1000
Branches: master
https://developer.blender.org/rB3225261f131fa3b0eb4a2bfc181945ee74bca794

Fix incorrect textbox use w/ scaled fonts

===================================================================

M	source/blender/blenkernel/intern/font.c

===================================================================

diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 2adf8eb..23261b6 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -777,7 +777,7 @@ makebreak:
 
 			if ((tb_scale.h != 0.0f) &&
 			    (cu->totbox > (curbox + 1)) &&
-			    ((-(yof - tb_scale.y)) > (tb_scale.h - (linedist * cu->fsize)) - yof_scale))
+			    ((-(yof - tb_scale.y)) > (tb_scale.h - linedist) - yof_scale))
 			{
 				maxlen = 0;
 				curbox++;




More information about the Bf-blender-cvs mailing list