Merging r50147 through r50148 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 23 Aug 2012 09:05:45 +0000 (09:05 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 23 Aug 2012 09:05:45 +0000 (09:05 +0000)
1  2 
release/scripts/startup/bl_ui/space_sequencer.py

index a0121867199d8fdbcce62e876a2e857cef3e1850,25054a6baa68812d1de0f72aa4ecfe01a178b949..2fcd5ef8a87ce4ed2e75c2f48c4e358ac9b64310
@@@ -882,11 -882,6 +882,11 @@@ class SEQUENCER_PT_view(SequencerButton
              col.prop(st, "show_separate_color")
          col.prop(st, "proxy_render_size")
  
 +        #col = layout.column()
 +        #col.separator()
 +        #col.label(text="Color Management:")
 +        #col.template_colormanaged_view_settings(st, "view_settings", True)
 +
  
  class SEQUENCER_PT_modifiers(SequencerButtonsPanel, Panel):
      bl_label = "Modifiers"
  
              row = box.row()
              row.prop(mod, "show_expanded", text="", emboss=False)
-             row.prop(mod, "name")
+             row.prop(mod, "name", text="")
  
              row.prop(mod, "mute", text="")
-             props = row.operator("sequencer.strip_modifier_remove", text="", icon='X')
+             sub = row.row(align=True)
+             props = sub.operator("sequencer.strip_modifier_move", text="", icon='TRIA_UP')
+             props.name = mod.name
+             props.direction = 'UP'
+             props = sub.operator("sequencer.strip_modifier_move", text="", icon='TRIA_DOWN')
+             props.name = mod.name
+             props.direction = 'DOWN'
+             props = row.operator("sequencer.strip_modifier_remove", text="", icon='X', emboss=False)
              props.name = mod.name
  
              if mod.show_expanded: