[Bf-blender-cvs] [45a875f] master: Fix T46091: Video Sequencer rewrite *.png to _.png

[Bastien Montagne]

Commit: 45a875fec4c00ccf87c5605d85f004f6dd4be8a0
Author: Bastien Montagne
Date:   Sun Sep 13 08:20:48 2015 +0200
Branches: master
https://developer.blender.org/rB45a875fec4c00ccf87c5605d85f004f6dd4be8a0

Fix T46091: Video Sequencer rewrite *.png to _.png

Own mistake when adding filename safety check...

===================================================================

M       source/blender/editors/space_file/file_ops.c

===================================================================

diff --git a/source/blender/editors/space_file/file_ops.c 
b/source/blender/editors/space_file/file_ops.c
index 7f5e6b9..74070a2 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';

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs