[Bf-blender-cvs] [eb61e6840ef] master: Merge branch 'blender2.7'

[Sergey Sharybin]

Commit: eb61e6840efc1323bc021b44f1bb0f958b3f71b8
Author: Sergey Sharybin
Date:   Tue Jan 15 18:42:37 2019 +0100
Branches: master
https://developer.blender.org/rBeb61e6840efc1323bc021b44f1bb0f958b3f71b8

Merge branch 'blender2.7'

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



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

diff --cc release/scripts/startup/bl_ui/space_sequencer.py
index 1d1b857b2f1,47e7b02211a..622fc3ba201
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@@ -275,10 -279,31 +275,34 @@@ class SEQUENCER_MT_marker(Menu)
          from .space_time import marker_menu_generic
          marker_menu_generic(layout)
  
 +        if is_sequencer_view:
 +            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"