[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53574] trunk/blender/source/blender/ editors/space_sequencer/sequencer_edit.c: Fix #33674: Meta strip could overlap with other strips when exiting edit mode

[Sergey Sharybin]

Revision: 53574
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53574
Author:   nazgul
Date:     2013-01-05 08:03:16 +0000 (Sat, 05 Jan 2013)
Log Message:
-----------
Fix #33674: Meta strip could overlap with other strips when exiting edit mode

Not sure what's the best thing to do here, for now just added vertical shuffle
of meta strip if it overlaps with other strips when existing edit mode.

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	2013-01-05 07:39:14 UTC (rev 53573)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2013-01-05 08:03:16 UTC (rev 53574)
@@ -1906,6 +1906,9 @@
 		for (seq = ed->seqbasep->first; seq; seq = seq->next)
 			BKE_sequence_calc(scene, seq);
 
+		if (BKE_sequence_test_overlap(ed->seqbasep, ms->parseq))
+			BKE_sequence_base_shuffle(ed->seqbasep, ms->parseq, scene);
+
 		BKE_sequencer_active_set(scene, ms->parseq);
 
 		ms->parseq->flag |= SELECT;