diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-17 19:42:01 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-17 19:42:01 +0400 |
| commit | e4756f4c330bc422f23d26bf7f6afaa0fe849dda (patch) | |
| tree | 401706b122e52246c0569cc5b0730ca6e9fccbac /source/blender/blenlib | |
| parent | ebc971f532e1413986dfc302a30dbe361f24a081 (diff) | |
2.5: installation paths, local directories (in the same folder as executable)
are now considered system rather than user directories, as you would expect
these to override any system directory for local installations.
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/path_util.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 2f8e4ab44b2..470676cb461 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -953,11 +953,11 @@ 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; case BLENDER_SYSTEM_DATAFILES: + if (get_path_local(path, "datafiles", subfolder)) break; if (get_path_system(path, "datafiles", subfolder, "BLENDER_SYSTEM_DATAFILES")) break; return NULL; @@ -973,11 +973,11 @@ 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; case BLENDER_SYSTEM_CONFIG: + if (get_path_local(path, "config", subfolder)) break; if (get_path_system(path, "config", subfolder, "BLENDER_SYSTEM_CONFIG")) break; return NULL; @@ -988,11 +988,11 @@ 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; case BLENDER_SYSTEM_SCRIPTS: + if (get_path_local(path, "scripts", subfolder)) break; if (get_path_system(path, "scripts", subfolder, "BLENDER_SYSTEM_SCRIPTS")) break; return NULL; @@ -1002,6 +1002,7 @@ char *BLI_get_folder(int folder_id, char *subfolder) return NULL; case BLENDER_SYSTEM_PYTHON: + if (get_path_local(path, "python", subfolder)) break; if (get_path_system(path, "python", subfolder, "BLENDER_SYSTEM_PYTHON")) break; return NULL; } |