[Bf-blender-cvs] [cb7ead2e3b6] master: Fix T68658: Text offset makes scale to fit not to work

[Dalai Felinto]

Commit: cb7ead2e3b62b9f1df85c985801db7918204dd2a
Author: Dalai Felinto
Date:   Wed Aug 14 15:08:25 2019 -0300
Branches: master
https://developer.blender.org/rBcb7ead2e3b62b9f1df85c985801db7918204dd2a

Fix T68658: Text offset makes scale to fit not to work

Differential Revision: https://developer.blender.org/D5484

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

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

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

diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 78117a4f615..b55635560be 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -955,7 +955,7 @@ static bool vfont_to_curve(Object *ob,
         }
       }
 
-      current_line_length += xof;
+      current_line_length += xof - MARGIN_X_MIN;
       if (ct->dobreak) {
         current_line_length += twidth;
       }
@@ -1026,7 +1026,7 @@ static bool vfont_to_curve(Object *ob,
     }
     ct++;
   }
-  current_line_length += xof + twidth;
+  current_line_length += xof + twidth - MARGIN_X_MIN;
   longest_line_length = MAX2(current_line_length, longest_line_length);
 
   cu->lines = 1;