Merging trunk up to r39145.
[blender-staging.git] / source / blender / editors / space_sequencer / sequencer_edit.c
index 6a69d32d307fb83b11116a23eebaa7876c848de3..b9f6b9866911db8d2e506bd0ce40dbf1afdb2e8d 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);
@@ -1225,7 +1228,7 @@ static int sequencer_mute_exec(bContext *C, wmOperator *op)
                }
        }
        
-       seq_update_muting(scene, ed);
+       seq_update_muting(ed);
        WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene);
        
        return OPERATOR_FINISHED;
@@ -1272,7 +1275,7 @@ static int sequencer_unmute_exec(bContext *C, wmOperator *op)
                }
        }
        
-       seq_update_muting(scene, ed);
+       seq_update_muting(ed);
        WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene);
        
        return OPERATOR_FINISHED;
@@ -1897,7 +1900,7 @@ static int sequencer_meta_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 
        }
 
-       seq_update_muting(scene, ed);
+       seq_update_muting(ed);
        WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene);
 
        return OPERATOR_FINISHED;
@@ -1961,7 +1964,7 @@ static int sequencer_meta_make_exec(bContext *C, wmOperator *op)
 
        if( seq_test_overlap(ed->seqbasep, seqm) ) shuffle_seq(ed->seqbasep, seqm, scene);
 
-       seq_update_muting(scene, ed);
+       seq_update_muting(ed);
 
        seqbase_unique_name_recursive(&scene->ed->seqbase, seqm);
 
@@ -2034,7 +2037,7 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op))
        }
 
        sort_seq(scene);
-       seq_update_muting(scene, ed);
+       seq_update_muting(ed);
 
        WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, scene);