[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12342] trunk/blender/source/blender: small changes suggested by ton ans gsr

[Campbell Barton]

Revision: 12342
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12342
Author:   campbellbarton
Date:     2007-10-22 15:26:47 +0200 (Mon, 22 Oct 2007)

Log Message:
-----------
small changes suggested by ton ans gsr

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/Makefile
    trunk/blender/source/blender/makesdna/DNA_userdef_types.h

Modified: trunk/blender/source/blender/blenkernel/intern/Makefile
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/Makefile	2007-10-22 11:50:05 UTC (rev 12341)
+++ trunk/blender/source/blender/blenkernel/intern/Makefile	2007-10-22 13:26:47 UTC (rev 12342)
@@ -61,8 +61,7 @@
 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)

Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2007-10-22 11:50:05 UTC (rev 12341)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2007-10-22 13:26:47 UTC (rev 12342)
@@ -177,11 +177,11 @@
 	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;