Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2015-09-13 09:20:48 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-09-13 09:20:48 +0300
commit45a875fec4c00ccf87c5605d85f004f6dd4be8a0 (patch)
tree46c60fab48053e99a56b98578782f1587b5a05ac
parentc56deb132e0448756a5d241201b80a4f7b680155 (diff)
Fix T46091: Video Sequencer rewrite *.png to _.png
Own mistake when adding filename safety check...
-rw-r--r--source/blender/editors/space_file/file_ops.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index 7f5e6b93cfb..74070a255bd 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -1831,12 +1831,13 @@ void file_filename_enter_handle(bContext *C, void *UNUSED(arg_unused), void *arg
matched_file[0] = '\0';
filepath[0] = '\0';
- BLI_filename_make_safe(sfile->params->file);
-
file_expand_directory(C);
matches = file_select_match(sfile, sfile->params->file, matched_file);
+ /* *After* file_select_match! */
+ BLI_filename_make_safe(sfile->params->file);
+
if (matches) {
/* int i, numfiles = filelist_numfiles(sfile->files); */ /* XXX UNUSED */
sfile->params->file[0] = '\0';