diff options
| author | Maikon Araujo <Nokiam> | 2017-11-28 01:33:08 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-29 20:11:36 +0300 |
| commit | 4b4702ab8af6f74edc20ba6735d74f61aa15ce47 (patch) | |
| tree | 521f4ab1e83633b26dc9e467c25fe2cc4fa0f02e /release | |
| parent | 4f7280da404c5054da4061335fee1dac24d9c812 (diff) | |
Sequencer: add many more color blend modes, and a new color mix strip.
Differential Revision: https://developer.blender.org/D2872
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 106e6695553..94924106542 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -361,6 +361,7 @@ class SEQUENCER_MT_add_effect(Menu): layout.operator("sequencer.effect_strip_add", text="Wipe").type = 'WIPE' layout.operator("sequencer.effect_strip_add", text="Glow").type = 'GLOW' layout.operator("sequencer.effect_strip_add", text="Text").type = 'TEXT' + layout.operator("sequencer.effect_strip_add", text="Color Mix").type = 'COLORMIX' layout.operator("sequencer.effect_strip_add", text="Transform").type = 'TRANSFORM' layout.operator("sequencer.effect_strip_add", text="Color").type = 'COLOR' layout.operator("sequencer.effect_strip_add", text="Speed Control").type = 'SPEED' @@ -602,7 +603,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): 'ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER', 'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP', 'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', 'SPEED', - 'MULTICAM', 'GAUSSIAN_BLUR', 'TEXT', + 'MULTICAM', 'GAUSSIAN_BLUR', 'TEXT', 'COLORMIX' } def draw(self, context): @@ -750,6 +751,12 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): row = col.row(align=True) row.prop(strip, "size_x") row.prop(strip, "size_y") + elif strip.type == 'COLORMIX': + split = layout.split(percentage=0.35) + split.label(text="Blend Mode:") + split.prop(strip, "blend_effect", text="") + row = layout.row(align=True) + row.prop(strip, "factor", slider=True) class SEQUENCER_PT_input(SequencerButtonsPanel, Panel): @@ -770,7 +777,7 @@ class SEQUENCER_PT_input(SequencerButtonsPanel, Panel): 'ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER', 'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP', 'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', - 'MULTICAM', 'SPEED', 'ADJUSTMENT', + 'MULTICAM', 'SPEED', 'ADJUSTMENT', 'COLORMIX' } def draw(self, context): @@ -1009,7 +1016,7 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel, Panel): 'META', 'ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER', 'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP', 'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', - 'MULTICAM', 'SPEED', 'ADJUSTMENT', + 'MULTICAM', 'SPEED', 'ADJUSTMENT', 'COLORMIX' } def draw(self, context): |