kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

animation system wasnt being updated when rendering with the sequencer

Browse Source
This commit is contained in:
Campbell Barton 2009-12-15 10:35:50 +00:00
parent 2f80f813f3
commit df8c1f5b91
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release/scripts/ui/space_sequencer.py
View File

@ -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):

6
source/blender/editors/space_sequencer/sequencer_edit.c
View File

@ -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:

5
source/blender/render/intern/source/pipeline.c
View File

@ -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);