Merging r49775 through r49807 from trunk into soc-2011-tomato
[blender.git] / release / scripts / startup / bl_ui / space_sequencer.py
index c98e3d47dc841b63d789a8b09a2f61c4da9292a7..9c996cc31dc6b22fbe2361922a30c81dc908b34e 100644 (file)
@@ -428,13 +428,19 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
     def draw(self, context):
         layout = self.layout
 
+        sequencer = context.scene.sequence_editor
         strip = act_strip(context)
+
         if strip.input_count > 0:
             col = layout.column()
             col.prop(strip, "input_1")
             if strip.input_count > 1:
                 col.prop(strip, "input_2")
 
+        if strip.is_supports_mask:
+            col = layout.column()
+            col.prop_search(strip, "input_mask", sequencer, "sequences")
+
         if strip.type == 'COLOR':
             layout.prop(strip, "color")
 
@@ -765,21 +771,21 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel, Panel):
         if strip.use_color_balance and strip.color_balance:  # TODO - need to add this somehow
             col = layout.column()
             col.label(text="Lift:")
-            col.template_color_wheel(strip.color_balance, "lift", value_slider=False, cubic=True)
+            col.template_color_wheel(strip.color_balance, "lift", value_slider=True, cubic=True)
             row = col.row()
             row.prop(strip.color_balance, "lift", text="")
             row.prop(strip.color_balance, "invert_lift", text="Inverse")
 
             col = layout.column()
             col.label(text="Gamma:")
-            col.template_color_wheel(strip.color_balance, "gamma", value_slider=False, lock_luminosity=True, cubic=True)
+            col.template_color_wheel(strip.color_balance, "gamma", value_slider=True, lock_luminosity=True, cubic=True)
             row = col.row()
             row.prop(strip.color_balance, "gamma", text="")
             row.prop(strip.color_balance, "invert_gamma", text="Inverse")
 
             col = layout.column()
             col.label(text="Gain:")
-            col.template_color_wheel(strip.color_balance, "gain", value_slider=False, lock_luminosity=True, cubic=True)
+            col.template_color_wheel(strip.color_balance, "gain", value_slider=True, lock_luminosity=True, cubic=True)
             row = col.row()
             row.prop(strip.color_balance, "gain", text="")
             row.prop(strip.color_balance, "invert_gain", text="Inverse")