archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5: installation paths, local directories (in the same folder as executable)

Browse Source 
are now considered system rather than user directories, as you would expect
these to override any system directory for local installations.
This commit is contained in:
Brecht Van Lommel
2010-07-17 15:42:01 +00:00
parent ebc971f532
commit e4756f4c33
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenlib/intern/path_util.c
View File

@@ -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;
}