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>2014-05-15 15:59:16 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-05-15 15:59:16 +0400
commit4725941f2338e1b2a919f1dafd00ff283a47766a (patch)
treeb10ff123f7d65e0e44f180ccf65038d06c523b41 /source/blender/blenkernel/intern/font.c
parentaafe6322fe0f018f58898a50c8d6557cc0ea0218 (diff)
Fix for cursor location with xoffset & flush alignment
Diffstat (limited to 'source/blender/blenkernel/intern/font.c')
-rw-r--r--source/blender/blenkernel/intern/font.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 88c2b251b9d..109d79127ca 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -822,9 +822,12 @@ makebreak:
}
}
else if ((cu->spacemode == CU_FLUSH) && (cu->tb[0].w != 0.0f)) {
- for (i = 0; i < lnr; i++)
- if (linedata2[i] > 1)
- linedata[i] = ((linedata3[i] - linedata[i]) + cu->xof) / (linedata2[i] - 1);
+ for (i = 0; i < lnr; i++) {
+ linedata[i] = ((linedata3[i] - linedata[i]) + cu->xof);
+ if (linedata2[i] > 1) {
+ linedata[i] /= (linedata2[i] - 1);
+ }
+ }
for (i = 0; i <= slen; i++) {
for (j = i; (!ELEM(mem[j], '\0', '\n')) && (chartransdata[j].dobreak == 0) && (j < slen); j++) {
/* do nothing */