Merging r50162 through r50171 from trunk into soc-2011-tomato

2012-08-24 09:09:33 +00:00
parent e68e1d69e1 501efb0e7c
commit 6bf49c47f8
51 changed files with 360 additions and 170 deletions
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -935,6 +935,10 @@ class SEQUENCER_PT_modifiers(SequencerButtonsPanel, Panel):
                    box.template_curve_mapping(mod, "curve_mapping", type='COLOR')
                elif mod.type == 'HUE_CORRECT':
                    box.template_curve_mapping(mod, "curve_mapping", type='HUE')
+                elif mod.type == 'BRIGHT_CONTRAST':
+                    col = box.column()
+                    col.prop(mod, "bright")
+                    col.prop(mod, "contrast")


 if __name__ == "__main__":  # only for live edit.