diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-09-04 17:41:06 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-09-04 17:41:06 +0300 |
commit | 3c29aad787f636167319950636f1497442075df8 (patch) | |
tree | 3a993cc25296ce987893b9f58b7c794b51e77f85 /source/blender/editors/space_file/filesel.c | |
parent | 498583844fb7d0adbbc91d512f98885800cdf46e (diff) | |
parent | e76e8fcdcc53455a52a6a73495881eddd346472c (diff) |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/blender_particles.cpp
source/blender/blenkernel/intern/particle.c
source/blender/gpu/intern/gpu_shader.c
Diffstat (limited to 'source/blender/editors/space_file/filesel.c')
-rw-r--r-- | source/blender/editors/space_file/filesel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index d9293aa126a..5eb261890b2 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -592,7 +592,7 @@ void ED_file_change_dir(bContext *C) sfile->params->filter_search[0] = '\0'; sfile->params->active_file = -1; - if (!file_is_dir(sfile, sfile->params->dir)) { + if (!filelist_is_dir(sfile->files, sfile->params->dir)) { BLI_strncpy(sfile->params->dir, filelist_dir(sfile->files), sizeof(sfile->params->dir)); /* could return but just refresh the current dir */ } |