Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2008-05-09 12:01:27 +0400
committerCampbell Barton <ideasman42@gmail.com>2008-05-09 12:01:27 +0400
commit55cbcd125dd9d3cf29f1a0bcf6ac8ee194785e3f (patch)
tree8b5e7b0e1b9303896134d126c1d8818005ccc850 /source/blender/src/editseq.c
parent9fb7381d2e19a4bd3c61ad4a6bae074d5b1b53a4 (diff)
[#10998] Sequencer: some new features missing from the menu items
also added Shift+H for muting unselected and fixed a problem with marker selection not working in the sequencer (shift+rmb logic was reversed)
Diffstat (limited to 'source/blender/src/editseq.c')
-rw-r--r--source/blender/src/editseq.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c
index bd1c265f2a1..50bd4d7c7f3 100644
--- a/source/blender/src/editseq.c
+++ b/source/blender/src/editseq.c
@@ -792,14 +792,13 @@ 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);
@@ -3809,9 +3808,15 @@ void seq_mute_sel(int mute) {
if(!ed) return;
for(seq= ed->seqbasep->first; seq; seq= seq->next) {
- if ((seq->flag & SELECT) && (seq->flag & SEQ_LOCK)==0) {
- if (mute) seq->flag |= SEQ_MUTE;
- else seq->flag &= ~SEQ_MUTE;
+ 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;
+ }
}
}
BIF_undo_push(mute?"Mute Strips, Sequencer":"UnMute Strips, Sequencer");