2.50:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD

Notes:
* Game and sequencer RNA, and sequencer header are now out of date
  a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
  not needed anymore.
  * Fix "duplicate strip" always increase the user count for ipo.
  * IPO pinning on sequencer strips was lost during Undo.

4 files changed, 53 insertions, 12 deletions

diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index 8373f588fb2..f6cf6de4b00 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -338,6 +338,10 @@ static int sequencer_add_sound_strip_exec(bContext *C, wmOperator *op)
 	
 	RNA_string_get(op->ptr, "filename", filename);
 
+	/* XXX if(sfile->flag & FILE_STRINGCODE) {
+		BLI_makestringcode(G.sce, str);
+	}*/
+
 // XXX	sound= sound_new_sound(filename);
 	sound= NULL;
 
diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.c b/source/blender/editors/space_sequencer/sequencer_buttons.c
index fb42d30e496..f127ab4b0cf 100644
--- a/source/blender/editors/space_sequencer/sequencer_buttons.c
+++ b/source/blender/editors/space_sequencer/sequencer_buttons.c
@@ -134,5 +134,3 @@ void SEQUENCER_OT_properties(wmOperatorType *ot)
 	ot->flag= 0;
 }
 
-
-
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 675602a23a0..bd31d8d86ff 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -741,12 +741,21 @@ static void draw_image_seq(Scene *scene, ARegion *ar, SpaceSeq *sseq)
 	static int recursive= 0;
 	float zoom;
 	float zoomx, zoomy;
+	int render_size = 0;
 
 	glClearColor(0.0, 0.0, 0.0, 0.0);
 	glClear(GL_COLOR_BUFFER_BIT);
 
-	rectx= (scene->r.size*scene->r.xsch)/100;
-	recty= (scene->r.size*scene->r.ysch)/100;
+	render_size = sseq->render_size;
+	if (render_size == 0) {
+		render_size = scene->r.size;
+	}
+	if (render_size < 0) {
+		return;
+	}
+
+	rectx= (render_size*scene->r.xsch)/100;
+	recty= (render_size*scene->r.ysch)/100;
 
 	/* BIG PROBLEM: the give_ibuf_seq() can call a rendering, which in turn calls redraws...
 	   this shouldn't belong in a window drawing....
@@ -758,13 +767,13 @@ static void draw_image_seq(Scene *scene, ARegion *ar, SpaceSeq *sseq)
 	else {
 		recursive= 1;
 		if (special_seq_update) {
-			ibuf= give_ibuf_seq_direct(scene, rectx, recty, (scene->r.cfra), special_seq_update);
+			ibuf= give_ibuf_seq_direct(scene, rectx, recty, (scene->r.cfra), render_size, special_seq_update);
 		} 
 		else if (!U.prefetchframes) { // XXX || (G.f & G_PLAYANIM) == 0) {
-			ibuf= (ImBuf *)give_ibuf_seq(scene, rectx, recty, (scene->r.cfra), sseq->chanshown);
+			ibuf= (ImBuf *)give_ibuf_seq(scene, rectx, recty, (scene->r.cfra), sseq->chanshown, render_size);
 		} 
 		else {
-			ibuf= (ImBuf *)give_ibuf_seq_threaded(scene, rectx, recty, (scene->r.cfra), sseq->chanshown);
+			ibuf= (ImBuf *)give_ibuf_seq_threaded(scene, rectx, recty, (scene->r.cfra), sseq->chanshown, render_size);
 		}
 		recursive= 0;
 		
@@ -815,6 +824,7 @@ static void draw_image_seq(Scene *scene, ARegion *ar, SpaceSeq *sseq)
 	
 	zoom= SEQ_ZOOM_FAC(sseq->zoom);
 	if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
+		zoom /= render_size / 100.0;
 		zoomx = zoom * ((float)scene->r.xasp / (float)scene->r.yasp);
 		zoomy = zoom;
 	} else {
@@ -949,13 +959,21 @@ void seq_viewmove(Scene *scene, ARegion *ar, SpaceSeq *sseq)
 void drawprefetchseqspace(Scene *scene, ARegion *ar, SpaceSeq *sseq)
 {
 	int rectx, recty;
+	int render_size = sseq->render_size;
+	if (render_size == 0) {
+		render_size = scene->r.size;
+	}
+	if (render_size < 0) {
+		return;
+	}
 
-	rectx= (scene->r.size*scene->r.xsch)/100;
-	recty= (scene->r.size*scene->r.ysch)/100;
+	rectx= (render_size*scene->r.xsch)/100;
+	recty= (render_size*scene->r.ysch)/100;
 
 	if(sseq->mainb != SEQ_DRAW_SEQUENCE) {
 		give_ibuf_prefetch_request(
-			rectx, recty, (scene->r.cfra), sseq->chanshown);
+			rectx, recty, (scene->r.cfra), sseq->chanshown,
+			render_size);
 	}
 }
 
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 8c3ec96971b..9c3191c93d6 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -160,7 +160,7 @@ void set_last_seq(Scene *scene, Sequence *seq)
 	ed->act_seq= seq;
 }
 
-Sequence *get_forground_frame_seq(Scene *scene, int frame)
+Sequence *get_foreground_frame_seq(Scene *scene, int frame)
 {
 	Editing *ed= seq_give_editing(scene, FALSE);
 	Sequence *seq, *best_seq=NULL;
@@ -879,12 +879,33 @@ static void recurs_del_seq_flag(Scene *scene, ListBase *lb, short flag, short de
 static Sequence *dupli_seq(Sequence *seq) 
 {
 	Sequence *seqn = MEM_dupallocN(seq);
+	// XXX animato: ID *id;
 
 	seq->tmp = seqn;
 		
 	seqn->strip= MEM_dupallocN(seq->strip);
 
-	if(seqn->ipo) seqn->ipo->id.us++;
+	// XXX animato
+#if 0
+	if (seqn->ipo) {
+		if (U.dupflag & USER_DUP_IPO) {
+			id= (ID *)seqn->ipo;
+			seqn->ipo= copy_ipo(seqn->ipo);
+			/* we don't need to decrease the number
+			 * of the ipo because we never increase it,
+			 * for example, adduplicate need decrease
+			 * the number but only because copy_object
+			 * call id_us_plus for the ipo block and
+			 * single_ipo_users only work if id->us > 1.
+			 *
+			 * need call ipo_idnew here, for drivers ??
+			 * - Diego
+			 */
+		}
+		else
+			seqn->ipo->id.us++;
+	}
+#endif
 
 	seqn->strip->tstripdata = 0;
 	seqn->strip->tstripdata_startstill = 0;