From c82efd3276b2f377bc9420eb7fb75d20d2a7a88a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 6 Oct 2017 00:18:57 +0200 Subject: Fix T52514: don't clear filename when dropping directory path in file browser. --- source/blender/editors/space_file/file_ops.c | 1 - 1 file changed, 1 deletion(-) (limited to 'source/blender/editors/space_file') diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index b7228f634bf..ab1bcbaa8b5 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -1302,7 +1302,6 @@ void file_sfile_filepath_set(SpaceFile *sfile, const char *filepath) if (BLI_is_dir(filepath)) { BLI_strncpy(sfile->params->dir, filepath, sizeof(sfile->params->dir)); - sfile->params->file[0] = '\0'; } else { if ((sfile->params->flag & FILE_DIRSEL_ONLY) == 0) { -- cgit v1.2.3 From c454d816a936e509aa3daaa27bd92037cfe6de0e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 6 Oct 2017 16:56:41 +1100 Subject: Cleanup: style --- source/blender/editors/space_file/filelist.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source/blender/editors/space_file') diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 48f3dd4fde6..d670af59bc9 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -1994,8 +1994,7 @@ int ED_path_extension_type(const char *path) else if (BLI_testextensie(path, ".abc")) { return FILE_TYPE_ALEMBIC; } - else if (BLI_testextensie_array(path, imb_ext_image)) - { + else if (BLI_testextensie_array(path, imb_ext_image)) { return FILE_TYPE_IMAGE; } else if (BLI_testextensie(path, ".ogg")) { -- cgit v1.2.3