[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12287] trunk/blender/source/blender: adding a sequence would grab the markers, workaround for this.

[Campbell Barton]

Revision: 12287
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12287
Author:   campbellbarton
Date:     2007-10-18 21:40:59 +0200 (Thu, 18 Oct 2007)

Log Message:
-----------
adding a sequence would grab the markers, workaround for this.

Modified Paths:
--------------
    trunk/blender/source/blender/include/BIF_editseq.h
    trunk/blender/source/blender/src/editseq.c

Modified: trunk/blender/source/blender/include/BIF_editseq.h
===================================================================
--- trunk/blender/source/blender/include/BIF_editseq.h	2007-10-18 19:01:11 UTC (rev 12286)
+++ trunk/blender/source/blender/include/BIF_editseq.h	2007-10-18 19:40:59 UTC (rev 12287)
@@ -65,6 +65,7 @@
 void				touch_seq_files(void);
 void				seq_remap_paths(void);
 void				transform_seq(int mode, int context);
+void				transform_seq_nomarker(int mode, int context);
 void				un_meta(void);
 void				seq_cut(int cutframe);
 void				seq_separate_images(void);

Modified: trunk/blender/source/blender/src/editseq.c
===================================================================
--- trunk/blender/source/blender/src/editseq.c	2007-10-18 19:01:11 UTC (rev 12286)
+++ trunk/blender/source/blender/src/editseq.c	2007-10-18 19:40:59 UTC (rev 12287)
@@ -853,7 +853,7 @@
 		if(get_last_seq()) allqueue(REDRAWIPO, 0);
 		BIF_undo_push("Select Strips, Sequencer");
 
-		std_rmouse_transform(transform_seq);
+		std_rmouse_transform(transform_seq_nomarker);
 	}
 	
 	/* marker transform */
@@ -1300,7 +1300,7 @@
 	waitcursor(0);
 
 	BIF_undo_push("Add Image Strip, Sequencer");
-	transform_seq('g', 0);
+	transform_seq_nomarker('g', 0);
 
 }
 
@@ -1335,7 +1335,7 @@
 	waitcursor(0);
 
 	BIF_undo_push("Add Movie Strip, Sequencer");
-	transform_seq('g', 0);
+	transform_seq_nomarker('g', 0);
 
 }
 
@@ -1371,7 +1371,7 @@
 	waitcursor(0);
 
 	BIF_undo_push("Add Movie and HD-Audio Strip, Sequencer");
-	transform_seq('g', 0);
+	transform_seq_nomarker('g', 0);
 
 }
 
@@ -1400,7 +1400,7 @@
 	waitcursor(0);
 
 	BIF_undo_push("Add Sound (RAM) Strip, Sequencer");
-	transform_seq('g', 0);
+	transform_seq_nomarker('g', 0);
 }
 
 static void add_sound_strip_hd(char *name)
@@ -1428,7 +1428,7 @@
 	waitcursor(0);
 
 	BIF_undo_push("Add Sound (HD) Strip, Sequencer");
-	transform_seq('g', 0);
+	transform_seq_nomarker('g', 0);
 }
 
 #if 0
@@ -1673,7 +1673,7 @@
 		BIF_undo_push("Add Effect Strip, Sequencer");
 	}
 
-	transform_seq('g', 0);
+	transform_seq_nomarker('g', 0);
 
 	return 1;
 }
@@ -1851,7 +1851,7 @@
 				if(seq->len>0) strip->stripdata= MEM_callocN(seq->len*sizeof(StripElem), "stripelem");
 
 				BIF_undo_push("Add Scene Strip, Sequencer");
-				transform_seq('g', 0);
+				transform_seq_nomarker('g', 0);
 			}
 		}
 		MEM_freeN(str);
@@ -2289,7 +2289,7 @@
 	addlisttolist(ed->seqbasep, &new);
 
 	BIF_undo_push("Add Duplicate, Sequencer");
-	transform_seq('g', 0);
+	transform_seq_nomarker('g', 0);
 }
 
 int insert_gap(int gap, int cfra)
@@ -3242,6 +3242,20 @@
 	allqueue(REDRAWSEQ, 0);
 }
 
+/*	since grab can move markers, we must turn this off before adding a new sequence
+	I am not so happy with this, but the baddness in contained here - Campbell */
+void transform_seq_nomarker(int mode, int context) {
+	SpaceSeq *sseq= curarea->spacedata.first;
+	int flag_back;
+	if (!sseq) return; /* should never happen */
+	flag_back = sseq->flag;
+	sseq->flag &= ~SEQ_MARKER_TRANS;
+	
+	transform_seq(mode, context);
+	
+	sseq->flag = flag_back;
+}
+
 void seq_cut(int cutframe)
 {
 	Editing *ed;