diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-16 17:01:50 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-16 17:01:50 +0400 |
| commit | 23af7214d3721862eae9f4601791ee0602740f50 (patch) | |
| tree | 8448278beb69102800d07579c30cc6a517f8f360 /source/blender/blenlib/intern/util.c | |
| parent | bc347d380d0fa44f54d78c419bebbbdf2d5e208e (diff) | |
2.5:
* Also look in ./release for scripts instead of next to executable.
* Some warning fixes.
Diffstat (limited to 'source/blender/blenlib/intern/util.c')
| -rw-r--r-- | source/blender/blenlib/intern/util.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/util.c b/source/blender/blenlib/intern/util.c index 78fc78f67f7..040b2d4027c 100644 --- a/source/blender/blenlib/intern/util.c +++ b/source/blender/blenlib/intern/util.c @@ -832,7 +832,8 @@ char *BLI_gethome(void) { * * $HOME/.blender/folder_name * path_to_executable/.blender/folder_name - * release/folder_name (in svn) + * path_to_executable/release/folder_name (in svn) + * ./release/folder_name (in svn) * * returns NULL if none is found. */ @@ -911,7 +912,7 @@ char *BLI_gethome_folder(char *folder_name) else return homedir; } - /* last try for folder_name dir: blender in svn dir, folder_name/ inside release/: */ + /* try path_to_executable/release/folder_name (in svn) */ if (folder_name) { BLI_snprintf(tmpdir, sizeof(tmpdir), "release/%s", folder_name); BLI_make_file_string("/", fulldir, bprogdir, tmpdir); @@ -919,6 +920,13 @@ char *BLI_gethome_folder(char *folder_name) else fulldir[0] = '\0'; } + /* try ./release/folder_name (in svn) */ + if(folder_name) { + BLI_snprintf(fulldir, sizeof(fulldir), "./release/%s", folder_name); + if (BLI_exists(fulldir)) return fulldir; + else fulldir[0] = '\0'; + } + return NULL; } |