diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-07-05 14:12:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-07-05 14:12:24 +0400 |
| commit | 0f58a4c798a01975b78d17d8dc25efa4ec3a1cdf (patch) | |
| tree | fd89c46b133a501f225fca6538938f9a9372b64d /source/blender | |
| parent | 58778d41e2496d3ba4d150eda7fb9d247a639c53 (diff) | |
when making a metastrip use active strip for the channel when available.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 9e52c2f4e38..1592c2093c4 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -1892,8 +1892,7 @@ static int sequencer_meta_make_exec(bContext *C, wmOperator *op) Scene *scene= CTX_data_scene(C); Editing *ed= seq_give_editing(scene, FALSE); - Sequence *seq, *seqm, *next; - + Sequence *seq, *seqm, *next, *last_seq = seq_active_get(scene); int channel_max= 1; if(seqbase_isolated_sel_check(ed->seqbasep)==FALSE) { @@ -1918,7 +1917,7 @@ static int sequencer_meta_make_exec(bContext *C, wmOperator *op) } seq= next; } - seqm->machine= channel_max; + seqm->machine= last_seq ? last_seq->machine : channel_max; calc_sequence(scene, seqm); seqm->strip= MEM_callocN(sizeof(Strip), "metastrip"); |