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...
This commit is contained in:
Alexander Ewering 2005-09-18 23:44:30 +00:00
parent 47d5cc2757
commit 9db14ce9b3

@ -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 // We do not want to see any character for \n or \r
if(cha != '\n' && cha != '\r') if(cha != '\n' && cha != '\r')
buildchar(cu, cha, info, ct->xof, ct->yof, ct->rot, i); 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; uloverlap = 0;
if ( (i<(slen-1)) && (mem[i+1] != '\n') && (mem[i+1] != '\r') && 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) ((mem[i+1] != ' ') || (cu->strinfo[i+1].flag & CU_UNDERLINE)) && ((cu->strinfo[i+1].flag & CU_WRAP)==0)