- 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

2 files changed, 3 insertions, 13 deletions

diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index 647ff535585..3e4c670dd04 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -1366,11 +1366,6 @@ void filldisplist(ListBase *dispbase, ListBase *to)
 	if(dispbase==0) return;
 	if(dispbase->first==0) return;
 
-	/* tijd= clock(); */
-	/* bit-wise and comes after == .... so this doesn't work...  */
-/*  	if(G.f & G_PLAYANIM == 0) waitcursor(1); */
-	if( !(G.f & G_PLAYANIM) ) waitcursor(1);
-
 	while(cont) {
 		cont= 0;
 		totvert=0;
@@ -1476,11 +1471,6 @@ void filldisplist(ListBase *dispbase, ListBase *to)
 	
 	/* do not free polys, needed for wireframe display */
 	
-	/* same as above ... */
-/*  	if(G.f & G_PLAYANIM == 0) waitcursor(0); */
-	if( !(G.f & G_PLAYANIM) ) waitcursor(0);
-	/* printf("time: %d\n",(clock()-tijd)/1000); */
-
 }
 
 static void bevels_to_filledpoly(Curve *cu, ListBase *dispbase)
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++;