diff options
author | Alexander Ewering <blender@instinctive.de> | 2005-06-18 02:52:11 +0400 |
---|---|---|
committer | Alexander Ewering <blender@instinctive.de> | 2005-06-18 02:52:11 +0400 |
commit | ad8ff9762b3e0b0f1040209bb885c75f9cd7e1d8 (patch) | |
tree | b7c124380b0406085cae345e7652eede801811ed /source/blender/blenkernel/intern/font.c | |
parent | e48ea7e668b34b5c90e18b3901c98c56dca27173 (diff) |
- Fix a few warnings
- Improved text editing for justified ('Flush') text: Line will not
be filled up until it is completed (wordwrap or Enter)
- Fixed waitcursor flickering in displist.c
Diffstat (limited to 'source/blender/blenkernel/intern/font.c')
-rw-r--r-- | source/blender/blenkernel/intern/font.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 999b8315242..c67591fc715 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -358,7 +358,7 @@ int getselection(int *start, int *end) struct chartrans *text_to_curve(Object *ob, int mode) { VFont *vfont, *oldvfont; - VFontData *vfd; + VFontData *vfd= NULL; Curve *cu, *cucu; struct chartrans *chartransdata, *ct; float distfac, tabfac, ctime, dtime, tvec[4], vec[4], rotvec[3], minx, maxx, miny, maxy; @@ -374,7 +374,7 @@ struct chartrans *text_to_curve(Object *ob, int mode) TextBox *tb; int curbox; int selstart, selend; - SelBox *sb; + SelBox *sb= NULL; /* renark: do calculations including the trailing '\0' of a string because the cursor can be at that location */ @@ -546,7 +546,7 @@ struct chartrans *text_to_curve(Object *ob, int mode) for (i=0; i<=slen; i++) { for (j=i; (cu->str[j]) && (cu->str[j]!='\n') && (cu->str[j]!='\r') && (chartransdata[j].dobreak==0) && (j<slen); j++); - if ((cu->str[j]!='\r') && (cu->str[j]!='\n')) { + if ((cu->str[j]!='\r') && (cu->str[j]!='\n') && (chartransdata[j].dobreak!=0)) { ct->xof+= ct->charnr*linedata[ct->linenr]; } ct++; |