[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11457] trunk/blender/source/blender/src: =Lack of #ifdef INTERNATIONAL=

Joseph Eagar joeedh at gmail.com
Wed Aug 1 12:33:01 CEST 2007


Revision: 11457
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11457
Author:   joeedh
Date:     2007-08-01 12:33:01 +0200 (Wed, 01 Aug 2007)

Log Message:
-----------
=Lack of #ifdef INTERNATIONAL=

Recent font preview commit didn't have the proper enclosing #ifdef INTERNATIONAL
blocks.  Honestly, I have no idea why we bother, but added them anyway.

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

Modified: trunk/blender/source/blender/src/filesel.c
===================================================================
--- trunk/blender/source/blender/src/filesel.c	2007-08-01 10:19:16 UTC (rev 11456)
+++ trunk/blender/source/blender/src/filesel.c	2007-08-01 10:33:01 UTC (rev 11457)
@@ -111,7 +111,9 @@
 
 #include "BIF_fsmenu.h"  /* include ourselves */
 
+#ifdef INTERNATIONAL
 #include "FTF_Api.h"
+#endif
 
 #if defined WIN32 || defined __BeOS
 int fnmatch(const char *pattern, const char *string, int flags)
@@ -2027,8 +2029,10 @@
 							if (sfile->f_fp) {
 								sprintf (tmpstr, "%s%s", sfile->dir, sfile->file);
 								/* printf ("%s\n", tmpstr); */
+								#ifdef INTERNATIONAL
 								if (!FTF_GetNewFont ((const unsigned char *)tmpstr, 0, U.fontsize))
 									error ("No font file");
+								#endif
 							}
 						}
 						if(event==MIDDLEMOUSE && sfile->type) filesel_execute(sfile);

Modified: trunk/blender/source/blender/src/header_filesel.c
===================================================================
--- trunk/blender/source/blender/src/header_filesel.c	2007-08-01 10:19:16 UTC (rev 11456)
+++ trunk/blender/source/blender/src/header_filesel.c	2007-08-01 10:33:01 UTC (rev 11457)
@@ -158,6 +158,7 @@
 	
 		xco+= 100;	// scroll
 	}
+	#ifdef INTERNATIONAL
 	else if(sfile->type==FILE_LOADFONT) {
 		uiDefIconButBitS(block, TOG, FILE_SHOWSHORT, B_SORTFILELIST, ICON_FONTPREVIEW, xco+= XIC, 0, XIC, YIC, &sfile->f_fp, 0, 0, 0, 0, "Activate font preview");
 		if (sfile->f_fp)
@@ -165,6 +166,7 @@
 	
 		xco+= 100;	// scroll
 	}
+	#endif
 
 	uiDrawBlock(block);
 	

Modified: trunk/blender/source/blender/src/interface_draw.c
===================================================================
--- trunk/blender/source/blender/src/interface_draw.c	2007-08-01 10:19:16 UTC (rev 11456)
+++ trunk/blender/source/blender/src/interface_draw.c	2007-08-01 10:33:01 UTC (rev 11457)
@@ -1604,11 +1604,15 @@
 			ui_rasterpos_safe(x, (but->y1+but->y2- 9.0)/2.0, but->aspect);
 			if(but->type==IDPOIN) transopts= 0;	// no translation, of course!
 			else transopts= (U.transopts & USER_TR_BUTTONS);
-
+			
+		#ifdef INTERNATIONAL
 			if (but->type == FTPREVIEW)
 				FTF_DrawNewFontString (but->drawstr+but->ofs, FTF_INPUT_UTF8);
 			else
 				BIF_DrawString(but->font, but->drawstr+but->ofs, transopts);
+		#else
+			BIF_DrawString(but->font, but->drawstr+but->ofs, transopts);
+		#endif
 
 			/* part text right aligned */
 			if(cpoin) {





More information about the Bf-blender-cvs mailing list