[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29980] trunk/blender/source/blender/ editors/space_sequencer/sequencer_edit.c: when making a metastrip use active strip for the channel when available.

[Campbell Barton]

Revision: 29980
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29980
Author:   campbellbarton
Date:     2010-07-05 12:12:24 +0200 (Mon, 05 Jul 2010)

Log Message:
-----------
when making a metastrip use active strip for the channel when available.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2010-07-05 09:56:06 UTC (rev 29979)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2010-07-05 10:12:24 UTC (rev 29980)
@@ -1892,8 +1892,7 @@
 	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 @@
 		}
 		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");