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

== installation paths ==

Browse Source 
* rename BLI_gethome to BLI_getDefaultDocumentFolder to better reflect how this function is used
* replaced BLI_gethome with getenv("HOME") on Linux and Mac where it retrieves location of bookmarks that are inserted as system bookmarks. BLI_gethome was a thin wrapper around these and in this case the user's home directory is what is actually wanted.
This commit is contained in:
Andrea Weikert
2010-07-16 16:02:07 +00:00
parent 3ef41270f9
commit ca3f3317b2
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenlib/BLI_path_util.h
View File

@@ -40,14 +40,14 @@ extern "C" {
struct ListBase;
struct direntry;
char *BLI_gethome(void);
char *BLI_getDefaultDocumentFolder(void);
char *BLI_get_folder(int folder_id, char *subfolder);
char *BLI_get_folder_create(int folder_id, char *subfolder);
/* folder_id */
/* general, will find baserd on user/local/system priority */
/* general, will find based on user/local/system priority */
#define BLENDER_CONFIG 1
#define BLENDER_DATAFILES 2
#define BLENDER_SCRIPTS 3

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

@@ -732,10 +732,10 @@ void BLI_getlastdir(const char* dir, char *last, int maxlen)
}
}
/* This is now only used to really get the user's home folder */
/* This is now only used to really get the user's default document folder */
/* On Windows I chose the 'Users/<MyUserName>/Documents' since it's used
as default location to save documents */
char *BLI_gethome(void) {
char *BLI_getDefaultDocumentFolder(void) {
#if !defined(WIN32)
return getenv("HOME");

2
source/blender/editors/space_file/file_ops.c
View File

@@ -945,7 +945,7 @@ int file_directory_exec(bContext *C, wmOperator *unused)
if ( sfile->params->dir[0] == '~' ) {
char tmpstr[sizeof(sfile->params->dir)-1];
strncpy(tmpstr, sfile->params->dir+1, sizeof(tmpstr));
BLI_join_dirfile(sfile->params->dir, BLI_gethome(), tmpstr);
BLI_join_dirfile(sfile->params->dir, BLI_getDefaultDocumentFolder(), tmpstr);
}
#ifdef WIN32

4
source/blender/editors/space_file/fsmenu.c
View File

@@ -338,7 +338,7 @@ void fsmenu_read_system(struct FSMenu* fsmenu)
/* As 10.4 doesn't provide proper API to retrieve the favorite places,
assume they are the standard ones
TODO : replace hardcoded paths with proper BLI_get_folder calls */
home = BLI_gethome();
home = getenv("HOME");
if(home) {
BLI_snprintf(line, 256, "%s/", home);
fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, line, 1, 0);
@@ -458,7 +458,7 @@ void fsmenu_read_system(struct FSMenu* fsmenu)
#else
/* unix */
{
char *home= BLI_gethome();
char *home= getenv("HOME");
if(home) {
BLI_snprintf(line, FILE_MAXDIR, "%s/", home);

2
source/blender/windowmanager/intern/wm_init_exit.c
View File

@@ -166,7 +166,7 @@ void WM_init(bContext *C, int argc, char **argv)
read_history();
if(G.sce[0] == 0)
BLI_make_file_string("/", G.sce, BLI_gethome(), "untitled.blend");
BLI_make_file_string("/", G.sce, BLI_getDefaultDocumentFolder(), "untitled.blend");
BLI_strncpy(G.lib, G.sce, FILE_MAX);