[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13258] trunk/blender/source/blender: user pref to make relative paths an option you can save ( peachers need to be strict with this for the farm)

[Campbell Barton]

Revision: 13258
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13258
Author:   campbellbarton
Date:     2008-01-16 12:43:22 +0100 (Wed, 16 Jan 2008)

Log Message:
-----------
user pref to make relative paths an option you can save (peachers need to be strict with this for the farm)

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_userdef_types.h
    trunk/blender/source/blender/src/filesel.c
    trunk/blender/source/blender/src/space.c

Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2008-01-16 07:19:21 UTC (rev 13257)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2008-01-16 11:43:22 UTC (rev 13258)
@@ -230,7 +230,7 @@
 #define USER_CUSTOM_RANGE		(1 << 17)
 #define USER_ADD_EDITMODE		(1 << 18)
 #define USER_ADD_VIEWALIGNED	(1 << 19)
-#define USER_ADD_VIEWALIGNED	(1 << 19)
+#define USER_RELPATHS			(1 << 20)
 
 /* viewzom */
 #define USER_ZOOM_CONT			0

Modified: trunk/blender/source/blender/src/filesel.c
===================================================================
--- trunk/blender/source/blender/src/filesel.c	2008-01-16 07:19:21 UTC (rev 13257)
+++ trunk/blender/source/blender/src/filesel.c	2008-01-16 11:43:22 UTC (rev 13258)
@@ -1192,7 +1192,7 @@
 	/* sfile->act is used for databrowse: double names of library objects */
 	sfile->act= -1;
 
-	if(G.relbase_valid && BLI_convertstringcode(name, G.sce, G.scene->r.cfra))
+	if(G.relbase_valid && U.flag & USER_RELPATHS)
 		sfile->flag |= FILE_STRINGCODE;
 	else
 		sfile->flag &= ~FILE_STRINGCODE;

Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c	2008-01-16 07:19:21 UTC (rev 13257)
+++ trunk/blender/source/blender/src/space.c	2008-01-16 11:43:22 UTC (rev 13258)
@@ -4096,6 +4096,10 @@
 			0, 0, 0, 0, 0, "Select the default texture plugin location");
 		uiBlockEndAlign(block);
 		
+		uiDefButBitI(block, TOG, USER_RELPATHS, B_DRAWINFO, "Relative Paths Default",
+			(xpos+edgsp+(5*mpref)+(5*midsp)),y3,mpref,buth,
+			&(U.flag), 0, 0, 0, 0, "Default relative path option for the file selector");
+		
 		uiBlockBeginAlign(block);
 		uiDefBut(block, TEX, 0, "Seq Plugins: ",
 			(xpos+edgsp+(3*lpref)+(3*midsp)),y2,(lpref-smfileselbut),buth,