diff options
author | Joshua Leung <aligorith@gmail.com> | 2011-06-16 06:46:38 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2011-06-16 06:46:38 +0400 |
commit | cfcc4b4fcd7dabd0929db53fc5a9cf0833704259 (patch) | |
tree | a61c1736ae50f7581e3d06ddeafb8ae7901a978b /source/blender/editors/space_sequencer | |
parent | 4ef1e67ce8245e03ff41c00a09be98d65dfe49f5 (diff) |
== Simple Title Cards for Sequencer ==
This commit adds an experimental effect strip to the sequencer: "Title
Card".
This is useful for adding simple one-line text section headers or
"title cards" (i.e. title + author/contact details) to video clips,
which is often seen in demo videos accompanying papers and/or
animation tests.
See http://aligorith.blogspot.com/2011/06/gsoc11-simple-title-
cards.html for some more details on usage.
Code notes:
- There are a few things I've done here which will probably need
cleaning up. For instance, the hacks to get threadsafe fonts for
rendering, and also the way I've tried to piggyback the backdrop
drawing on top of the Solid Colour strips (this method was used to
keep changes here minimal, but is quite fragile if things change).
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 119c5da309e..e1efd5b4622 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -127,6 +127,7 @@ static void get_seq_color3ubv(Scene *curscene, Sequence *seq, unsigned char col[ case SEQ_GLOW: case SEQ_MULTICAM: case SEQ_ADJUSTMENT: + case SEQ_TITLECARD: UI_GetThemeColor3ubv(TH_SEQ_EFFECT, col); /* slightly offset hue to distinguish different effects */ diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index c8965c4d3db..46638007fb1 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -98,9 +98,10 @@ EnumPropertyItem sequencer_prop_effect_types[] = { {SEQ_GLOW, "GLOW", 0, "Glow", "Glow effect strip type"}, {SEQ_TRANSFORM, "TRANSFORM", 0, "Transform", "Transform effect strip type"}, {SEQ_COLOR, "COLOR", 0, "Color", "Color effect strip type"}, - {SEQ_SPEED, "SPEED", 0, "Speed", "Color effect strip type"}, + {SEQ_SPEED, "SPEED", 0, "Speed", ""}, {SEQ_MULTICAM, "MULTICAM", 0, "Multicam Selector", ""}, {SEQ_ADJUSTMENT, "ADJUSTMENT", 0, "Adjustment Layer", ""}, + {SEQ_TITLECARD, "TITLE_CARD", 0, "Title Card", ""}, {0, NULL, 0, NULL, NULL} }; @@ -408,6 +409,7 @@ int event_to_efftype(int event) if(event==16) return SEQ_COLOR; if(event==17) return SEQ_SPEED; if(event==18) return SEQ_ADJUSTMENT; + if(event==19) return SEQ_TITLECARD; return 0; } @@ -520,7 +522,8 @@ static void change_sequence(Scene *scene) "|Transform%x15" "|Color Generator%x16" "|Speed Control%x17" - "|Adjustment Layer%x18"); + "|Adjustment Layer%x18" + "|Title Card%x19"); if(event > 0) { if(event==1) { SWAP(Sequence *,last_seq->seq1,last_seq->seq2); |