diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-12-15 01:52:01 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-12-15 03:05:40 +0300 |
| commit | 7fa72b8970b921190ae4fbd56748c0c808f870d1 (patch) | |
| tree | cd70e58392eca3d1c90082cffac2f0c40d7fb892 | |
| parent | 6f6c26bdb48a6e6d4e350ca6e1a5f0c6347635a7 (diff) | |
Fix 'change path' opening file browser with wrong filter for sound strips
Changing path of a sound strip (select strip->C->'Path/Files') opened a file browser without filter for sound files, so sound files weren't visible.
Also, for movie/image files, now only movie **or** image files are visible in the file browser by default (instead of both).
Reported by @venomgfx, thanks!
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 13 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index b08bff13967..c0f58772be3 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -267,12 +267,23 @@ class SEQUENCER_MT_change(Menu): def draw(self, context): layout = self.layout + strip = act_strip(context) layout.operator_context = 'INVOKE_REGION_WIN' layout.operator_menu_enum("sequencer.change_effect_input", "swap") layout.operator_menu_enum("sequencer.change_effect_type", "type") - layout.operator("sequencer.change_path", text="Path/Files") + prop = layout.operator("sequencer.change_path", text="Path/Files") + + if strip: + stype = strip.type + + if stype == 'IMAGE': + prop.filter_image = True; + elif stype == 'MOVIE': + prop.filter_movie = True; + elif stype == 'SOUND': + prop.filter_sound = True; class SEQUENCER_MT_frame(Menu): diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index fd8b1165719..d65cce1ad9c 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -3832,7 +3832,7 @@ void SEQUENCER_OT_change_path(struct wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - WM_operator_properties_filesel(ot, FILE_TYPE_FOLDER | FILE_TYPE_IMAGE | FILE_TYPE_MOVIE, FILE_SPECIAL, FILE_OPENFILE, + WM_operator_properties_filesel(ot, FILE_TYPE_FOLDER, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_DIRECTORY | WM_FILESEL_RELPATH | WM_FILESEL_FILEPATH | WM_FILESEL_FILES, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA); RNA_def_boolean(ot->srna, "use_placeholders", false, "Use Placeholders", "Use placeholders for missing frames of the strip"); |