animation system wasnt being updated when rendering with the sequencer

3 files changed, 9 insertions, 5 deletions

diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py
index 54fe48758f1..16e744a9de3 100644
--- a/release/scripts/ui/space_sequencer.py
+++ b/release/scripts/ui/space_sequencer.py
@@ -275,8 +275,7 @@ class SEQUENCER_MT_strip(bpy.types.Menu):
 
         layout.operator("sequencer.snap")
 
-        layout.operator("sequencer.swap_right")
-        layout.operator("sequencer.swap_left")
+        layout.operator_menu_enum("sequencer.swap", "side")
 
 
 class SequencerButtonsPanel(bpy.types.Panel):
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index e231c03a335..361d92c1930 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -2667,7 +2667,7 @@ static int sequencer_swap_exec(bContext *C, wmOperator *op)
 void SEQUENCER_OT_swap(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Swap Strip Left";
+	ot->name= "Swap Strip";
 	ot->idname= "SEQUENCER_OT_swap";
 	ot->description="Swap active strip with strip to the left.";
 	
@@ -2688,9 +2688,9 @@ static int sequencer_rendersize_exec(bContext *C, wmOperator *op)
 	Scene *scene= CTX_data_scene(C);
 	Sequence *active_seq = active_seq_get(scene);
 
-	if(active_seq==NULL) return OPERATOR_CANCELLED;
+	if(active_seq==NULL)
+		return OPERATOR_CANCELLED;
 
-	printf("got active sequence\n");
 	switch (active_seq->type) {
 		case SEQ_IMAGE:
 		case SEQ_MOVIE:
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 8034c2612e4..1eb864e173d 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2439,6 +2439,11 @@ static void do_render_seq(Render * re)
 	RenderResult *rr = re->result;
 	int cfra = re->r.cfra;
 
+	if(recurs_depth==0) {
+		/* otherwise sequencer animation isnt updated */
+		BKE_animsys_evaluate_all_animation(G.main, frame_to_float(re->scene, cfra));
+	}
+
 	recurs_depth++;
 
 	ibuf= give_ibuf_seq(re->scene, rr->rectx, rr->recty, cfra, 0, 100.0);