[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25399] trunk/blender: animation system wasnt being updated when rendering with the sequencer

[Campbell Barton]

Revision: 25399
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25399
Author:   campbellbarton
Date:     2009-12-15 11:35:50 +0100 (Tue, 15 Dec 2009)

Log Message:
-----------
animation system wasnt being updated when rendering with the sequencer

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_sequencer.py
    trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py	2009-12-15 10:04:54 UTC (rev 25398)
+++ trunk/blender/release/scripts/ui/space_sequencer.py	2009-12-15 10:35:50 UTC (rev 25399)
@@ -275,8 +275,7 @@
 
         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):

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2009-12-15 10:04:54 UTC (rev 25398)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c	2009-12-15 10:35:50 UTC (rev 25399)
@@ -2667,7 +2667,7 @@
 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 @@
 	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:

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2009-12-15 10:04:54 UTC (rev 25398)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2009-12-15 10:35:50 UTC (rev 25399)
@@ -2439,6 +2439,11 @@
 	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);