diff options
| author | Andrea Weikert <elubie@gmx.net> | 2010-07-21 09:49:48 +0400 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2010-07-21 09:49:48 +0400 |
| commit | 51bd50f746e56ade6fdfe04882af5f0d4b38367a (patch) | |
| tree | 29722ac1a7e4810f3f73374fd5360da4d2d22679 /source/blender/blenlib | |
| parent | 4c526245240178077516948784c3a51971a35830 (diff) | |
== installation paths ==
Hopefully last fix for path issues for this release
* The config folder should also be searched for in the 'local' path for local installations
(This code was already there, but removed in revision 30440)
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/path_util.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 470676cb461..d3e2b8f83e5 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -953,6 +953,7 @@ char *BLI_get_folder(int folder_id, char *subfolder) return NULL; case BLENDER_USER_DATAFILES: + if (get_path_local(path, "datafiles", subfolder)) break; if (get_path_user(path, "datafiles", subfolder, "BLENDER_USER_DATAFILES")) break; return NULL; @@ -973,6 +974,7 @@ char *BLI_get_folder(int folder_id, char *subfolder) return NULL; case BLENDER_USER_CONFIG: + if (get_path_local(path, "config", subfolder)) break; if (get_path_user(path, "config", subfolder, "BLENDER_USER_CONFIG")) break; return NULL; @@ -988,6 +990,7 @@ char *BLI_get_folder(int folder_id, char *subfolder) return NULL; case BLENDER_USER_SCRIPTS: + if (get_path_local(path, "scripts", subfolder)) break; if (get_path_user(path, "scripts", subfolder, "BLENDER_USER_SCRIPTS")) break; return NULL; |