small changes suggested by ton ans gsr

source/blender/blenkernel/intern/Makefile

@@ -61,8 +61,7 @@ CPPFLAGS += -I../../include
 CPPFLAGS += -I../../render/extern/include
 
 # for image stamping
-CPPFLAGS += -I../../../../intern/bmfont
-
+CPPFLAGS += -I$(NAN_BMFONT)/include
 # for sound
 #CPPFLAGS += -I../../../kernel/gen_system
 CPPFLAGS +=  $(NAN_SDLCFLAGS)

source/blender/makesdna/DNA_userdef_types.h

@@ -177,11 +177,11 @@ typedef struct UserDef {
 	short obcenter_dia;
 	short rvisize;			/* rotating view icon size */
 	short rvibright;		/* rotating view icon brightness */
-	char versemaster[160];
-	char verseuser[160];
 	short recent_files;		/* maximum number of recently used files to remember  */
 	short smooth_viewtx;	/* miliseconds to spend spinning the view */
 	short glreslimit;
+	char versemaster[160];
+	char verseuser[160];
 	float glalphaclip, pad;
 	
 } UserDef;