bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

== Sequencer ==

Browse Source 
* Fix button drawing in header finally, sigh.
* Fixes: 
  [#8262] Hide Meta Strip does not hide contained Audio
This commit is contained in:
Peter Schlaile 2008-02-24 13:26:27 +00:00
parent eb21b2b16e
commit 775f845146
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/src/header_seq.c
View File

@ -720,9 +720,9 @@ void seq_buttons()
minchan = -BLI_countlist(&((Editing*)G.scene->ed)->metastack);
uiDefButS(block, NUM, B_REDR, "Chan:",
xco, 0, 3.5 * XIC,YIC,
&sseq->chanshown, minchan, MAXSEQ, 0, 0,
"The channel number shown in the image preview. 0 is the result of all strips combined.");
xco, 0, 3.5 * XIC,YIC,
&sseq->chanshown, minchan, MAXSEQ, 0, 0,
"The channel number shown in the image preview. 0 is the result of all strips combined.");
xco+= 8 + XIC*3.5;
@ -760,13 +760,18 @@ void seq_buttons()
}
} else {
/* ZOOM and BORDER */
xco+= 8;
uiBlockBeginAlign(block);
uiDefIconButI(block, TOG, B_VIEW2DZOOM, ICON_VIEWZOOM, xco+=XIC,0,XIC,YIC, &viewmovetemp, 0, 0, 0, 0, "Zooms view in and out (Ctrl MiddleMouse)");
uiDefIconBut(block, BUT, B_IPOBORDER, ICON_BORDERMOVE, xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Zooms view to fit area");
uiBlockEndAlign(block);
xco+= 16;
uiDefIconButI(block, TOG, B_VIEW2DZOOM,
ICON_VIEWZOOM,
xco,0,XIC,YIC, &viewmovetemp,
0, 0, 0, 0,
"Zooms view in and out (Ctrl MiddleMouse)");
xco += XIC;
uiDefIconBut(block, BUT, B_IPOBORDER,
ICON_BORDERMOVE,
xco,0,XIC,YIC, 0,
0, 0, 0, 0,
"Zooms view to fit area");
xco += 8 + XIC;
}
uiDefBut(block, BUT, B_SEQCLEAR, "Refresh", xco,0,3*XIC,YIC, 0, 0, 0, 0, 0, "Clears all buffered images in memory");

3
source/blender/src/seqaudio.c
View File

@ -362,7 +362,8 @@ static void audio_fill_seq(Sequence * seq, void * mixdown,
Uint8 *sstream, int len)
{
while(seq) {
if (seq->type == SEQ_META) {
if (seq->type == SEQ_META &&
(!(seq->flag & SEQ_MUTE))) {
audio_fill_seq(seq->seqbase.first,
mixdown, sstream, len);
}