diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-01-16 14:43:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-01-16 14:43:22 +0300 |
| commit | 7c1961234b9e6d872c0abb9ae548f4a6922a2b70 (patch) | |
| tree | 11d975e2d485a804d3a5800369829a0fc2d63dc7 /source | |
| parent | c6118036bc044bd5f25106dfb0b422ee2310d5ba (diff) | |
user pref to make relative paths an option you can save (peachers need to be strict with this for the farm)
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 2 | ||||
| -rw-r--r-- | source/blender/src/filesel.c | 2 | ||||
| -rw-r--r-- | source/blender/src/space.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 68692b82ba5..16b7cdd87df 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -230,7 +230,7 @@ extern UserDef U; /* from usiblender.c !!!! */ #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 diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c index d6bbedec2b3..33f0fe5788e 100644 --- a/source/blender/src/filesel.c +++ b/source/blender/src/filesel.c @@ -1192,7 +1192,7 @@ static void activate_fileselect_(int type, char *title, char *file, short *menup /* 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; diff --git a/source/blender/src/space.c b/source/blender/src/space.c index e09da2b4a3b..beed318b0d3 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -4096,6 +4096,10 @@ void drawinfospace(ScrArea *sa, void *spacedata) 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, |