Fixing Bug: 3273, Removing my goto calls from font.c.

source/blender/blenkernel/intern/font.c

@@ -663,7 +663,14 @@ struct chartrans *text_to_curve(Object *ob, int mode)
 	}
 
 	vfd= vfont_get_data(vfont);
-	if(!vfd) goto errcse;
+
+	/* The VFont Data can not be found */
+	if(!vfd)
+	{
+		if(mem)
+			MEM_freeN(mem);	
+		return 0;
+	}
 
 	/* calc offset and rotation of each char */
 	ct = chartransdata =
@@ -730,13 +737,28 @@ struct chartrans *text_to_curve(Object *ob, int mode)
 		}
 #endif
 
+		/* No VFont found */
+		if (vfont==0) 
+		{
+			if(mem)
+				MEM_freeN(mem);
+			MEM_freeN(chartransdata);
+			return 0;
+		}
 
-	if (vfont==0) goto errcse;
 		if (vfont != oldvfont) {
 			vfd= vfont_get_data(vfont);
 			oldvfont = vfont;
 		}
-	if (!vfd) goto errcse;    	
+
+		/* VFont Data for VFont couldn't be found */
+		if (!vfd)
+		{
+			if(mem)
+				MEM_freeN(mem);
+			MEM_freeN(chartransdata);
+			return 0;
+		}
 
 		// The character wasn't found, propably ascii = 0, then the width shall be 0 as well
 		if(!che)
@@ -750,7 +772,7 @@ struct chartrans *text_to_curve(Object *ob, int mode)
 
 		// Calculate positions
 		if((tb->w != 0.0) && (ct->dobreak==0) && ((xof-(tb->x/cu->fsize)+twidth)*cu->fsize) > tb->w) {
-//		fprintf(stderr, "linewidth exceeded: %c%c%c...\n", mem[i], mem[i+1], mem[i+2]);
+	//		fprintf(stderr, "linewidth exceeded: %c%c%c...\n", mem[i], mem[i+1], mem[i+2]);
 			for (j=i; j && (mem[j] != '\n') && (mem[j] != '\r') && (chartransdata[j].dobreak==0); j--) {
 				if (mem[j]==' ' || mem[j]=='-') {
 					ct -= (i-(j-1));
@@ -764,7 +786,7 @@ struct chartrans *text_to_curve(Object *ob, int mode)
 					goto makebreak;
 				}
 				if (chartransdata[j].dobreak) {
-//				fprintf(stderr, "word too long: %c%c%c...\n", mem[j], mem[j+1], mem[j+2]);
+	//				fprintf(stderr, "word too long: %c%c%c...\n", mem[j], mem[j+1], mem[j+2]);
 					ct->dobreak= 1;
 					cu->strinfo[i+1].flag |= CU_WRAP;
 					ct -= 1;
@@ -1159,7 +1181,6 @@ struct chartrans *text_to_curve(Object *ob, int mode)
 		return chartransdata;
 	}
 
-errcse:
 	if(mem)
 		MEM_freeN(mem);
 

source/blender/src/interface_draw.c

@@ -66,6 +66,7 @@
 #include "BKE_utildefines.h"
 #include "BKE_font.h"
 #include "BKE_global.h"
+#include "datatoc.h"            /* std font */
 
 #include "BIF_gl.h"
 #include "BIF_graphics.h"
@@ -1717,6 +1718,7 @@ static void ui_draw_but_CHARTAB(uiBut *but)
 	wchar_t wstr[2];
 	unsigned char ustr[16];
 	PackedFile *pf;
+	int result = 0;
 
 	/* Calculate the size of the button */
 	width = abs(but->x2 - but->x1);
@@ -1824,6 +1826,21 @@ static void ui_draw_but_CHARTAB(uiBut *but)
 		ex = but->x1 + butw;
 	}	
 	glShadeModel(GL_FLAT);
+
+	/* Return Font Settings to original */
+	if(U.fontsize && U.fontname[0])
+	{
+		result = FTF_SetFont(U.fontname, 0, U.fontsize);
+	}
+	else if (U.fontsize)
+	{
+		result = FTF_SetFont(datatoc_bfont_ttf, datatoc_bfont_ttf_size, U.fontsize);
+	}
+
+	if (result == 0)
+	{
+		result = FTF_SetFont(datatoc_bfont_ttf, datatoc_bfont_ttf_size, 11);
+	}
 }
 
 #endif // INTERNATIONAL