sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix meta strips. Peter, please check if it is OK. It seems you just forgot

Browse Source 
this place (it's marked with /* crash */).
This commit is contained in:
Alexander Ewering 2006-11-10 17:34:34 +00:00
parent f314a00be1
commit ba0d87474c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/src/editseq.c
View File

@ -1982,7 +1982,7 @@ void make_meta(void)
Sequence *seq, *seqm, *next;
Editing *ed;
int tot;
ed= G.scene->ed;
if(ed==0) return;
@ -2008,15 +2008,17 @@ void make_meta(void)
while(seq) {
if(seq->flag & SELECT) {
if(seq->type & SEQ_EFFECT) {
if((seq->seq1->flag & SELECT)==0) tot= 0;
if((seq->seq2->flag & SELECT)==0) tot= 0;
if((seq->seq3->flag & SELECT)==0) tot= 0;
if((seq->seq1 && seq->seq1->flag & SELECT)==0) tot= 0;
if((seq->seq2 && seq->seq2->flag & SELECT)==0) tot= 0;
if((seq->seq3 && seq->seq3->flag & SELECT)==0) tot= 0;
}
}
else if(seq->type & SEQ_EFFECT) {
if(seq->seq1->flag & SELECT) tot= 0;
if(seq->seq2->flag & SELECT) tot= 0;
if(seq->seq3->flag & SELECT) tot= 0;
/* crash */
if(seq->seq1 && seq->seq1->flag & SELECT) tot= 0;
if(seq->seq2 && seq->seq2->flag & SELECT) tot= 0;
if(seq->seq3 && seq->seq3->flag & SELECT) tot= 0;
}
if(tot==0) break;
seq= seq->next;
@ -2047,7 +2049,6 @@ void make_meta(void)
seqm->strip->len= seqm->len;
seqm->strip->us= 1;
if(seqm->len) seqm->strip->stripdata= MEM_callocN(seqm->len*sizeof(StripElem), "metastripdata");
set_meta_stripdata(seqm);
BIF_undo_push("Make Meta Sequencer");