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:
authorAlexander Ewering <blender@instinctive.de>2005-09-19 03:44:30 +0400
committerAlexander Ewering <blender@instinctive.de>2005-09-19 03:44:30 +0400
commit9db14ce9b357ee7913e5665e0db528df42ce8e69 (patch)
treedd21775d81b38661924f243a62ef40be1d9b9301
parent47d5cc275767045a84e5d92d26a19e3de4236f8c (diff)
Disabling underlining for text objects with "TextOnCurve", because it can
never work correctly with it, the way it is currently implemented. The selection won't draw correctly either with TextOnCurve, and this is really asking a bit much.. What to do...
-rw-r--r--source/blender/blenkernel/intern/font.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index cbc4bd8e061..37e15de9590 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -1098,7 +1098,7 @@ struct chartrans *text_to_curve(Object *ob, int mode)
// We do not want to see any character for \n or \r
if(cha != '\n' && cha != '\r')
buildchar(cu, cha, info, ct->xof, ct->yof, ct->rot, i);
- if ((info->flag & CU_UNDERLINE) && (cha != '\n') && (cha != '\r')) {
+ if ((info->flag & CU_UNDERLINE) && (cu->textoncurve == NULL) && (cha != '\n') && (cha != '\r')) {
uloverlap = 0;
if ( (i<(slen-1)) && (mem[i+1] != '\n') && (mem[i+1] != '\r') &&
((mem[i+1] != ' ') || (cu->strinfo[i+1].flag & CU_UNDERLINE)) && ((cu->strinfo[i+1].flag & CU_WRAP)==0)