[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10873] trunk/blender/source/blender/src: interface_draw. c - when the char panel was displayed it would mess up font size for other panels .

[Campbell Barton]

Revision: 10873
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10873
Author:   campbellbarton
Date:     2007-06-04 12:53:37 +0200 (Mon, 04 Jun 2007)

Log Message:
-----------
interface_draw.c - when the char panel was displayed it would mess up font size for other panels.
drawview.c - removed unneeded comment (as GSR pointed out)

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawview.c
    trunk/blender/source/blender/src/interface_draw.c

Modified: trunk/blender/source/blender/src/drawview.c
===================================================================
--- trunk/blender/source/blender/src/drawview.c	2007-06-04 08:15:27 UTC (rev 10872)
+++ trunk/blender/source/blender/src/drawview.c	2007-06-04 10:53:37 UTC (rev 10873)
@@ -1515,8 +1515,7 @@
 				name = (G.vd->persp & V3D_PERSP_DO_3D_PERSP) ? "User Persp" : "User Ortho";
 			}
 	}
-
-	/* Easy sync of tests to clean up the string allocation */
+	
 	if (G.vd->localview) {
 		printable = malloc(strlen(name) + strlen(" (Local)_")); /* '_' gives space for '\0' */
 		strcpy(printable, name);

Modified: trunk/blender/source/blender/src/interface_draw.c
===================================================================
--- trunk/blender/source/blender/src/interface_draw.c	2007-06-04 08:15:27 UTC (rev 10872)
+++ trunk/blender/source/blender/src/interface_draw.c	2007-06-04 10:53:37 UTC (rev 10873)
@@ -1785,7 +1785,7 @@
 	PackedFile *pf;
 	int result = 0;
 	int charmax = G.charmax;
-
+	
 	/* <builtin> font in use. There are TTF <builtin> and non-TTF <builtin> fonts */
 	if(!strcmp(G.selfont->name, "<builtin>"))
 	{
@@ -1947,6 +1947,12 @@
 	{
 		result = FTF_SetFont((unsigned char *) datatoc_bfont_ttf, datatoc_bfont_ttf_size, 11);
 	}
+	
+	/* resets the font size */
+	if(G.ui_international == TRUE)
+	{
+		uiSetCurFont(but->block, UI_HELV);
+	}
 }
 
 #endif // INTERNATIONAL