Merging r50016 through r50021 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 19 Aug 2012 15:44:59 +0000 (15:44 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 19 Aug 2012 15:44:59 +0000 (15:44 +0000)
1  2 
release/scripts/startup/bl_ui/space_image.py
release/scripts/startup/bl_ui/space_sequencer.py
source/blender/blenkernel/BKE_colortools.h
source/blender/blenkernel/intern/colortools.c
source/blender/blenkernel/intern/sequencer.c
source/blender/makesrna/intern/rna_ui_api.c

index c5034ae403497514388af72ab96f8093e3fc5453,cd10bce8ef6e86701bfc59036425f8add5247693..4f453e4320ac4e5ba116429416477618946658f3
@@@ -878,11 -882,46 +882,51 @@@ 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"
+     def draw(self, context):
+         layout = self.layout
+         strip = act_strip(context)
+         sequencer = context.scene.sequence_editor
+         layout.operator_menu_enum("sequencer.strip_modifier_add", "type")
+         for mod in strip.modifiers:
+             box = layout.box()
+             row = box.row()
+             row.prop(mod, "show_expanded", text="", emboss=False)
+             row.prop(mod, "name")
+             row.prop(mod, "mute", text="")
+             props = row.operator("sequencer.strip_modifier_remove", text="", icon='X')
+             props.name = mod.name
+             if mod.show_expanded:
+                 row = box.row()
+                 row.prop(mod, "input_mask_type", expand=True)
+                 if mod.input_mask_type == 'STRIP':
+                     box.prop_search(mod, "input_mask_strip", sequencer, "sequences", text="Mask")
+                 else:
+                     box.prop(mod, "input_mask_id")
+                 if mod.type == 'COLOR_BALANCE':
+                     box.prop(mod, "color_multiply")
+                     draw_color_balance(box, mod.color_balance)
+                 elif mod.type == 'CURVES':
+                     box.template_curve_mapping(mod, "curve_mapping", type='COLOR')
+                 elif mod.type == 'HUE_CORRECT':
+                     box.template_curve_mapping(mod, "curve_mapping", type='HUE')
  if __name__ == "__main__":  # only for live edit.
      bpy.utils.register_module(__name__)