[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14291] trunk/blender/source/blender/src/ filesel.c: fix for [#8795] Unable to load an image into Image Texture Type

[Campbell Barton]

Revision: 14291
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14291
Author:   campbellbarton
Date:     2008-03-31 10:30:10 +0200 (Mon, 31 Mar 2008)

Log Message:
-----------
fix for [#8795] Unable to load an image into Image Texture Type

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

Modified: trunk/blender/source/blender/src/filesel.c
===================================================================
--- trunk/blender/source/blender/src/filesel.c	2008-03-31 03:40:47 UTC (rev 14290)
+++ trunk/blender/source/blender/src/filesel.c	2008-03-31 08:30:10 UTC (rev 14291)
@@ -1890,22 +1890,25 @@
 							sfile->ofs= 0;
 							do_draw= 1;
 						}
-					}
-					else {
-						if( strcmp(sfile->file, sfile->filelist[act].relname)) {
-							char tmpstr[240];
-							do_draw= 1;
-							BLI_strncpy(sfile->file, sfile->filelist[act].relname, sizeof(sfile->file));
-							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
+					} else {
+						if(event==MIDDLEMOUSE && sfile->type) filesel_execute(sfile);
+#ifdef INTERNATIONAL
+						else if (sfile->type==FILE_LOADFONT) {
+							/* Font Preview */
+							if( strcmp(sfile->file, sfile->filelist[act].relname)) {
+								char tmpstr[240];
+								do_draw= 1;
+								BLI_strncpy(sfile->file, sfile->filelist[act].relname, sizeof(sfile->file));
+								if (sfile->f_fp) {
+									sprintf (tmpstr, "%s%s", sfile->dir, sfile->file);
+									
+									if (!FTF_GetNewFont ((const unsigned char *)tmpstr, 0, U.fontsize))
+										error ("No font file");
+									
+								}
 							}
 						}
-						if(event==MIDDLEMOUSE && sfile->type) filesel_execute(sfile);
+#endif
 					}
 				}
 			}