1 files changed, 15 insertions, 14 deletions

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 601ead8654e..341d0a542e6 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2107,7 +2107,6 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
 		}
 	} else if(seq->type == SEQ_SCENE) {	// scene can be NULL after deletions
 		Scene *sce= seq->scene;// *oldsce= scene;
-		Render *re;
 		int have_seq= FALSE;
 		int sce_valid= FALSE;
 
@@ -2137,6 +2136,7 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
 			int frame= seq->sfra + se->nr + seq->anim_startofs;
 			int oldcfra = seq->scene->r.cfra;
 			Object *oldcamera= seq->scene->camera;
+			ListBase oldmarkers;
 
 			/* Hack! This function can be called from do_render_seq(), in that case
 			   the seq->scene can already have a Render initialized with same name,
@@ -2158,23 +2158,24 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
 			scene->r.scemode &= ~R_DOSEQ;
 
 			seq->scene->r.cfra= frame;
+			if(seq->scene_camera)	seq->scene->camera= seq->scene_camera;
+			else					scene_camera_switch_update(seq->scene);
+
+#ifdef DURIAN_CAMERA_SWITCH
+			/* stooping to new low's in hackyness :( */
+			oldmarkers= seq->scene->markers;
+			seq->scene->markers.first= seq->scene->markers.last= NULL;
+#endif
 
 			if(sequencer_view3d_cb && (seq->flag & SEQ_USE_SCENE_OPENGL) && (seq->scene == scene || have_seq==0)) {
 				/* opengl offscreen render */
-				if(seq->scene_camera)	seq->scene->camera= seq->scene_camera;
-				else					scene_camera_switch_update(seq->scene);
-
 				scene_update_for_newframe(seq->scene, seq->scene->lay);
 				se->ibuf= sequencer_view3d_cb(seq->scene, seqrectx, seqrecty);
 			}
 			else {
+				Render *re;
 				RenderResult rres;
 
-#ifdef DURIAN_CAMERA_SWITCH
-				/* stooping to new low's in hackyness :( */
-				scene_marker_tfm_translate(seq->scene, MAXFRAME*2, 0);
-#endif
-
 				if(rendering)
 					re= RE_NewRender(" do_build_seq_ibuf", RE_SLOT_DEFAULT);
 				else
@@ -2199,11 +2200,6 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
 				RE_ReleaseResultImage(re);
 
 				// BIF_end_render_callbacks();
-
-#ifdef DURIAN_CAMERA_SWITCH
-				/* stooping to new low's in hackyness :( */
-				scene_marker_tfm_translate(seq->scene, MAXFRAME*-2, 0);
-#endif
 			}
 			
 			/* restore */
@@ -2212,6 +2208,11 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int
 			seq->scene->r.cfra = oldcfra;
 			seq->scene->camera= oldcamera;
 
+#ifdef DURIAN_CAMERA_SWITCH
+			/* stooping to new low's in hackyness :( */
+			seq->scene->markers= oldmarkers;
+#endif
+
 			copy_to_ibuf_still(seq, se);
 
 			if (!build_proxy_run) {