soc-2008-mxcurioni: merged changes to revision 15163
[blender-staging.git] / source / blender / src / editseq.c
index fb0fac4489d9772eadb7769a831f5195fd217a6c..4873f5d6688992f14b3961ba6b265f471f88ca78 100644 (file)
@@ -803,13 +803,14 @@ void mouse_select_seq(void)
                /* select timeline marker */
                if (G.qual & LR_SHIFTKEY) {
                        oldflag= marker->flag;
+                       deselect_markers(0, 0);
+                       
                        if (oldflag & SELECT)
                                marker->flag &= ~SELECT;
                        else
                                marker->flag |= SELECT;
                }
                else {
-                       deselect_markers(0, 0);
                        marker->flag |= SELECT;                         
                }
                allqueue(REDRAWMARKER, 0);
@@ -3837,15 +3838,9 @@ void seq_mute_sel(int mute) {
        if(!ed) return;
        
        for(seq= ed->seqbasep->first; seq; seq= seq->next) {
-               if ((seq->flag & SEQ_LOCK)==0) {
-                       if (mute==-1) { /* hide unselected */
-                               if ((seq->flag & SELECT)==0) {
-                                       seq->flag |= SEQ_MUTE;
-                               }
-                       } else if (seq->flag & SELECT) {
-                               if (mute) seq->flag |= SEQ_MUTE;
-                               else seq->flag &= ~SEQ_MUTE;
-                       }
+               if ((seq->flag & SELECT) && (seq->flag & SEQ_LOCK)==0) {
+                       if (mute) seq->flag |= SEQ_MUTE;
+                       else seq->flag &= ~SEQ_MUTE;
                }
        }
        BIF_undo_push(mute?"Mute Strips, Sequencer":"UnMute Strips, Sequencer");