[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12281] trunk/blender/source/blender: removed some warnings from last commit.

[Campbell Barton]

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

Log Message:
-----------
removed some warnings from last commit. renamed a pointer in DNA which is only used for temp storage.

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_sequence_types.h
    trunk/blender/source/blender/src/editseq.c

Modified: trunk/blender/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_sequence_types.h	2007-10-18 13:03:20 UTC (rev 12280)
+++ trunk/blender/source/blender/makesdna/DNA_sequence_types.h	2007-10-18 13:07:21 UTC (rev 12281)
@@ -89,7 +89,7 @@
 typedef struct Sequence {
 
 	struct Sequence *next, *prev;
-	struct Sequence *newseq; /* should not be saved in DNA - only used for recursive duplicate and recently select more/less */
+	void *tmp; /* tmp var for copying, and tagging for linked selection */
 	char name[24]; /* name, not set by default and dosnt need to be unique as with ID's */
 
 	short flag, type;	/*flags bitmap (see below) and the type of sequence*/

Modified: trunk/blender/source/blender/src/editseq.c
===================================================================
--- trunk/blender/source/blender/src/editseq.c	2007-10-18 13:03:20 UTC (rev 12280)
+++ trunk/blender/source/blender/src/editseq.c	2007-10-18 13:07:21 UTC (rev 12281)
@@ -359,7 +359,7 @@
 		if(		(seq!=test) &&
 				(test->machine==seq->machine) &&
 				(test->depth==seq->depth) &&
-				((sel == -1) || (sel==seq->flag & SELECT)))
+				((sel == -1) || (sel==(seq->flag & SELECT))))
 		{
 			dist = MAXFRAME*2;
 			
@@ -2127,12 +2127,12 @@
 	seq= old->first;
 
 	while(seq) {
-		seq->newseq= 0;
+		seq->tmp= NULL;
 		if(seq->flag & SELECT) {
 
 			if(seq->type==SEQ_META) {
 				seqn= MEM_dupallocN(seq);
-				seq->newseq= seqn;
+				seq->tmp= seqn;
 				BLI_addtail(new, seqn);
 
 				seqn->strip= MEM_dupallocN(seq->strip);
@@ -2148,7 +2148,7 @@
 			}
 			else if(seq->type == SEQ_SCENE) {
 				seqn= MEM_dupallocN(seq);
-				seq->newseq= seqn;
+				seq->tmp= seqn;
 				BLI_addtail(new, seqn);
 
 				seqn->strip= MEM_dupallocN(seq->strip);
@@ -2160,7 +2160,7 @@
 			}
 			else if(seq->type == SEQ_MOVIE) {
 				seqn= MEM_dupallocN(seq);
-				seq->newseq= seqn;
+				seq->tmp= seqn;
 				BLI_addtail(new, seqn);
 
 				seqn->strip= MEM_dupallocN(seq->strip);
@@ -2183,7 +2183,7 @@
 			}
 			else if(seq->type == SEQ_RAM_SOUND) {
 				seqn= MEM_dupallocN(seq);
-				seq->newseq= seqn;
+				seq->tmp= seqn;
 				BLI_addtail(new, seqn);
 
 				seqn->strip= MEM_dupallocN(seq->strip);
@@ -2208,7 +2208,7 @@
 			}
 			else if(seq->type == SEQ_HD_SOUND) {
 				seqn= MEM_dupallocN(seq);
-				seq->newseq= seqn;
+				seq->tmp= seqn;
 				BLI_addtail(new, seqn);
 
 				seqn->strip= MEM_dupallocN(seq->strip);
@@ -2233,7 +2233,7 @@
 			}
 			else if(seq->type < SEQ_EFFECT) {
 				seqn= MEM_dupallocN(seq);
-				seq->newseq= seqn;
+				seq->tmp= seqn;
 				BLI_addtail(new, seqn);
 
 				seqn->strip->us++;
@@ -2243,12 +2243,12 @@
 			}
 			else {
 				seqn= MEM_dupallocN(seq);
-				seq->newseq= seqn;
+				seq->tmp= seqn;
 				BLI_addtail(new, seqn);
 
-				if(seq->seq1 && seq->seq1->newseq) seqn->seq1= seq->seq1->newseq;
-				if(seq->seq2 && seq->seq2->newseq) seqn->seq2= seq->seq2->newseq;
-				if(seq->seq3 && seq->seq3->newseq) seqn->seq3= seq->seq3->newseq;
+				if(seq->seq1 && seq->seq1->tmp) seqn->seq1= seq->seq1->tmp;
+				if(seq->seq2 && seq->seq2->tmp) seqn->seq2= seq->seq2->tmp;
+				if(seq->seq3 && seq->seq3->tmp) seqn->seq3= seq->seq3->tmp;
 
 				if(seqn->ipo) seqn->ipo->id.us++;
 
@@ -3453,7 +3453,7 @@
 	int isel;
 	
 	ed= G.scene->ed;
-	if(ed==0) return;
+	if(ed==0) return 0;
 	
 	if (sel) {
 		sel = SELECT;
@@ -3466,27 +3466,26 @@
 	if (!linked) {
 		/* if not linked we only want to touch each seq once, newseq */
 		for(seq= ed->seqbasep->first; seq; seq= seq->next) {
-			seq->newseq = NULL;
+			seq->tmp = NULL;
 		}
 	}
 	
 	for(seq= ed->seqbasep->first; seq; seq= seq->next) {
-		if((seq->flag & SELECT) == sel) {
-			if ((linked==0 && seq->newseq)==0) {
+		if((int)(seq->flag & SELECT) == sel) {
+			if ((linked==0 && seq->tmp)==0) {
 				/* only get unselected nabours */
 				neighbor = find_neighboring_sequence(seq, 1, isel);
 				if (neighbor) {
 					if (sel) {neighbor->flag |= SELECT; recurs_sel_seq(neighbor);}
 					else		neighbor->flag &= ~SELECT;
-					if (linked==0) neighbor->newseq = 1;
+					if (linked==0) neighbor->tmp = (Sequence *)1;
 					change = 1;
 				}
-				
 				neighbor = find_neighboring_sequence(seq, 2, isel);
 				if (neighbor) {
 					if (sel) {neighbor->flag |= SELECT; recurs_sel_seq(neighbor);}
 					else		neighbor->flag &= ~SELECT;
-					if (linked==0) neighbor->newseq = 1;
+					if (linked==0) neighbor->tmp = (void *)1;
 					change = 1;
 				}
 			}