Merge branch 'blender2.7'

This commit is contained in:
Sergey Sharybin 2019-01-15 18:42:37 +01:00
commit eb61e6840e
2 changed files with 26 additions and 1 deletions

@ -1 +1 @@
Subproject commit 46a9160c6f67d60610fdcc1dadbe3946a7010625
Subproject commit 4fd7be071b037562c23cf4711abd54dffb667fdf

View File

@ -279,6 +279,30 @@ class SEQUENCER_MT_marker(Menu):
layout.prop(st, "use_marker_sync")
class SEQUENCER_MT_change(Menu):
bl_label = "Change"
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")
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):
bl_label = "Frame"
@ -1365,6 +1389,7 @@ class SEQUENCER_PT_custom_props(SequencerButtonsPanel, PropertyPanel, Panel):
classes = (
SEQUENCER_MT_change,
SEQUENCER_HT_header,
SEQUENCER_MT_editor_menus,
SEQUENCER_MT_view,