Merging trunk up to r38167.
[blender-staging.git] / source / blender / editors / space_sequencer / sequencer_edit.c
index b7a7b6b5412e9c8b3bff5598acd9acbb0a5c137e..4252d051154871879bf479929e447fa6a85c22eb 100644 (file)
@@ -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}
 };
 
@@ -409,6 +410,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;
 }
 
@@ -521,7 +523,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);