diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-04 18:22:05 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-04 18:22:05 +0400 |
| commit | 8160829303bf3ba3c14f25cdb68aef5396faa56a (patch) | |
| tree | 58a1a6b5b87e69ae91f52c4bbcabd673328f9afe /source/blender/editors/space_file | |
| parent | 3e3ed974d79432662bfb7c694762c15682e3ca54 (diff) | |
| parent | fc0ce537bab8731cc60fda282a6c97d4816011e5 (diff) | |
Merged changes in the trunk up to revision 43881.
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/file_ops.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index daa2031bb5f..8a5f5c1427e 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -1096,8 +1096,14 @@ static void file_expand_directory(bContext *C) BLI_join_dirfile(sfile->params->dir, sizeof(sfile->params->dir), BLI_getDefaultDocumentFolder(), tmpstr); } -#ifdef WIN32 - if (sfile->params->dir[0] == '\0') { + else if (sfile->params->dir[0] == '\0') +#ifndef WIN32 + { + sfile->params->dir[0] = '/'; + sfile->params->dir[1] = '\0'; + } +#else + { get_default_root(sfile->params->dir); } /* change "C:" --> "C:\", [#28102] */ |