diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 18:31:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 18:31:26 +0300 |
commit | 77d6c09dddedc714cdd8327e33c8d0ebcb128476 (patch) | |
tree | 31e4685da2c97812580f5a5fd1c3ae120a339439 /source/blender/editors | |
parent | fda05127dbaa6545eaaf4b307769e00cf5ca504a (diff) | |
parent | 91504ed26e426445637a6aa73455052618ff0875 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_file/file_ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 217ce8f1d9a..fd998807106 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -1843,9 +1843,9 @@ static void file_expand_directory(bContext *C) SpaceFile *sfile = CTX_wm_space_file(C); if (sfile->params) { - /* TODO, what about // when relbase isn't valid? */ - if (G.relbase_valid && BLI_path_is_rel(sfile->params->dir)) { - BLI_path_abs(sfile->params->dir, G.main->name); + if (BLI_path_is_rel(sfile->params->dir)) { + /* Use of 'default' folder here is just to avoid an error message on '//' prefix. */ + BLI_path_abs(sfile->params->dir, G.relbase_valid ? G.main->name : BKE_appdir_folder_default()); } else if (sfile->params->dir[0] == '~') { char tmpstr[sizeof(sfile->params->dir) - 1]; |