Merged 15170:15635 from trunk (no conflicts or even merges)
[blender.git] / source / blender / src / editseq.c
index fb0fac4489d9772eadb7769a831f5195fd217a6c..f9432f8e69a8ca0e5e26499fd6776127cb1e424b 100644 (file)
@@ -2135,12 +2135,25 @@ void del_seq(void)
        Sequence *seq;
        MetaStack *ms;
        Editing *ed;
-
-       if(okee("Erase selected")==0) return;
+       int nothingSelected = TRUE;
 
        ed= G.scene->ed;
        if(ed==0) return;
 
+       seq=get_last_seq();
+       if (seq && seq->flag & SELECT) { /* avoid a loop since this is likely to be selected */
+               nothingSelected = FALSE;
+       } else {
+               for (seq = ed->seqbasep->first; seq; seq = seq->next) {
+                       if (seq->flag & SELECT) {
+                               nothingSelected = FALSE;
+                               break;
+                       }
+               }
+       }
+       
+       if(nothingSelected || okee("Erase selected")==0) return;
+
        /* free imbufs of all dependent strips */
        for(seq=ed->seqbasep->first; seq; seq=seq->next)
                if(seq->flag & SELECT)
@@ -2634,12 +2647,13 @@ void set_filter_seq(void)
        ed= G.scene->ed;
        if(ed==0) return;
 
-       if(okee("Set FilterY")==0) return;
+       if(okee("Set Deinterlace")==0) return;
 
        WHILE_SEQ(ed->seqbasep) {
                if(seq->flag & SELECT) {
                        if(seq->type==SEQ_MOVIE) {
                                seq->flag |= SEQ_FILTERY;
+                               reload_sequence_new_file(seq);
                        }
 
                }