[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13291] trunk/blender/source/blender: don' t display relative paths button when loading files.
Campbell Barton
ideasman42 at gmail.com
Sat Jan 19 00:31:18 CET 2008
Revision: 13291
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13291
Author: campbellbarton
Date: 2008-01-19 00:31:18 +0100 (Sat, 19 Jan 2008)
Log Message:
-----------
don't display relative paths button when loading files.
this was silly anyway since it always gave an error.
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/src/editimasel.c
trunk/blender/source/blender/src/filesel.c
trunk/blender/source/blender/src/header_filesel.c
trunk/blender/source/blender/src/header_imasel.c
Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h 2008-01-18 23:13:07 UTC (rev 13290)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h 2008-01-18 23:31:18 UTC (rev 13291)
@@ -421,7 +421,7 @@
/* filesel types */
#define FILE_UNIX 8
-#define FILE_BLENDER 8
+#define FILE_BLENDER 8 /* dont display relative paths */
#define FILE_SPECIAL 9
#define FILE_LOADLIB 1
Modified: trunk/blender/source/blender/src/editimasel.c
===================================================================
--- trunk/blender/source/blender/src/editimasel.c 2008-01-18 23:13:07 UTC (rev 13290)
+++ trunk/blender/source/blender/src/editimasel.c 2008-01-18 23:31:18 UTC (rev 13291)
@@ -195,7 +195,7 @@
simasel->files = BIF_filelist_new();
}
- if(G.relbase_valid && BLI_convertstringcode(name, G.sce, G.scene->r.cfra))
+ if(G.relbase_valid && U.flag & USER_RELPATHS && type != FILE_BLENDER)
simasel->flag |= FILE_STRINGCODE;
else
simasel->flag &= ~FILE_STRINGCODE;
Modified: trunk/blender/source/blender/src/filesel.c
===================================================================
--- trunk/blender/source/blender/src/filesel.c 2008-01-18 23:13:07 UTC (rev 13290)
+++ trunk/blender/source/blender/src/filesel.c 2008-01-18 23:31:18 UTC (rev 13291)
@@ -1192,7 +1192,7 @@
/* sfile->act is used for databrowse: double names of library objects */
sfile->act= -1;
- if(G.relbase_valid && U.flag & USER_RELPATHS)
+ if(G.relbase_valid && U.flag & USER_RELPATHS && type != FILE_BLENDER)
sfile->flag |= FILE_STRINGCODE;
else
sfile->flag &= ~FILE_STRINGCODE;
Modified: trunk/blender/source/blender/src/header_filesel.c
===================================================================
--- trunk/blender/source/blender/src/header_filesel.c 2008-01-18 23:13:07 UTC (rev 13290)
+++ trunk/blender/source/blender/src/header_filesel.c 2008-01-18 23:31:18 UTC (rev 13291)
@@ -136,10 +136,13 @@
uiDefIconButBitS(block, TOG, FILE_HIDE_DOT, B_RELOADDIR, ICON_GHOST,xco+=XIC,0,XIC,YIC, &sfile->flag, 0, 0, 0, 0, "Hides dot files");
uiBlockEndAlign(block);
- uiDefButBitS(block, TOG, FILE_STRINGCODE, 0, "Relative Paths", xco+=XIC+20,0,100,YIC, &sfile->flag, 0, 0, 0, 0, "Makes sure returned paths are relative to the current .blend file");
-
- xco+=90;
-
+ if(sfile->type==FILE_BLENDER) {
+ xco+=20;
+ } else {
+ uiDefButBitS(block, TOG, FILE_STRINGCODE, 0, "Relative Paths", xco+=XIC+20,0,100,YIC, &sfile->flag, 0, 0, 0, 0, "Makes sure returned paths are relative to the current .blend file");
+ xco+=90;
+ }
+
if(sfile->type==FILE_LOADLIB) {
uiBlockBeginAlign(block);
uiDefButBitS(block, TOGN, FILE_LINK, B_REDR, "Append", xco+=XIC,0,100,YIC, &sfile->flag, 0, 0, 0, 0, "Copies selected data into current project");
Modified: trunk/blender/source/blender/src/header_imasel.c
===================================================================
--- trunk/blender/source/blender/src/header_imasel.c 2008-01-18 23:13:07 UTC (rev 13290)
+++ trunk/blender/source/blender/src/header_imasel.c 2008-01-18 23:31:18 UTC (rev 13291)
@@ -181,10 +181,14 @@
uiBlockEndAlign(block);
}
}
+
+ if(simasel->type==FILE_BLENDER) {
+ xco+=20;
+ } else {
+ uiDefButBitS(block, TOG, FILE_STRINGCODE, 0, "Relative Paths", xco+=XIC+20,0,100,YIC, &simasel->flag, 0, 0, 0, 0, "Makes sure returned paths are relative to the current .blend file");
+ xco+=90;
+ }
- uiDefButBitS(block, TOG, FILE_STRINGCODE, 0, "Relative Paths", xco+=XIC+20,0,100,YIC, &simasel->flag, 0, 0, 0, 0, "Makes sure returned paths are relative to the current .blend file");
- xco+=90;
-
if(simasel->type==FILE_LOADLIB) {
uiBlockBeginAlign(block);
uiDefButBitS(block, TOGN, FILE_LINK, B_REDR, "Append", xco+=XIC,0,100,YIC, &simasel->flag, 0, 0, 0, 0, "Copies selected data into current project");
More information about the Bf-blender-cvs
mailing list