diff options
| author | Alexander Ewering <blender@instinctive.de> | 2006-11-10 20:34:34 +0300 |
|---|---|---|
| committer | Alexander Ewering <blender@instinctive.de> | 2006-11-10 20:34:34 +0300 |
| commit | ba0d87474c1f985e534a427d99df30f3343183af (patch) | |
| tree | 513202015a05d8e656988eea8959ddbdf3d23461 /source/blender/src/editseq.c | |
| parent | f314a00be16f9b3352425f86cc5a197fb2197367 (diff) | |
Fix meta strips. Peter, please check if it is OK. It seems you just forgot
this place (it's marked with /* crash */).
Diffstat (limited to 'source/blender/src/editseq.c')
| -rw-r--r-- | source/blender/src/editseq.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c index adfe3205f92..dd410e438c9 100644 --- a/source/blender/src/editseq.c +++ b/source/blender/src/editseq.c @@ -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"); |