diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-01-20 16:52:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-01-20 16:52:54 +0300 |
| commit | 8ded57d23600c7a8a6025beee2b3b6e5e8978849 (patch) | |
| tree | 7cdfa4163d6680b48f577a033c485305b522ff08 /source/blender/src/editseq.c | |
| parent | 223b4132a0bd9ff7cb359ed5916c72b97b8a0a7b (diff) | |
Cant use WHILE_SEQ when drawing,
drawing strips was setting the depth that would then incorrectly overlap when used with metastrips. - so metastrisp would grow when moved - showed up in peach animatic.
Now metastrips draw display differently- only immediate children are shown on the strip.
Also disabled overlap checking during transform for non zero depth strips since its not needed.
Diffstat (limited to 'source/blender/src/editseq.c')
| -rw-r--r-- | source/blender/src/editseq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c index 824f90a696f..e75a38d3a49 100644 --- a/source/blender/src/editseq.c +++ b/source/blender/src/editseq.c @@ -3307,7 +3307,7 @@ void transform_seq(int mode, int context) /* test for effect and overlap */ for(seq_index=0, seq=seqar[0]; seq_index < totseq_index; seq=seqar[++seq_index]) { - if(seq->flag & SELECT && !(seq->flag & SEQ_LOCK)) { + if((seq->depth==0) && (seq->flag & SELECT) && !(seq->flag & SEQ_LOCK)) { seq->flag &= ~SEQ_OVERLAP; if( test_overlap_seq(seq) ) { seq->flag |= SEQ_OVERLAP; @@ -3319,7 +3319,9 @@ void transform_seq(int mode, int context) else if(seq->seq3 && seq->seq3->flag & SELECT) calc_sequence(seq); } } - + /* warning, drawing should NEVER use WHILE_SEQ, + if it does the seq->depth value will be messed up and + overlap checks with metastrips will give incorrect results */ force_draw(0); } |