diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_sequencer.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 22 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_filter.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/RNA_access.h | 1 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 3 |
9 files changed, 21 insertions, 20 deletions
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index e6b468e0dc0..34d4b15b437 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -192,7 +192,7 @@ void seq_update_muting(struct Editing *ed); void clear_scene_in_allseqs(struct Scene *sce); -struct Sequence *get_seq_by_name(struct Scene *scene, const char *name); +struct Sequence *get_seq_by_name(struct ListBase *seqbase, const char *name, int recursive); struct Sequence *active_seq_get(struct Scene *scene); void active_seq_set(struct Scene *scene, struct Sequence *seq); diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 7bfeac037ce..0a2edf82cb0 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -350,7 +350,7 @@ Scene *add_scene(char *name) sce->r.bake_normal_space= R_BAKE_SPACE_TANGENT; sce->r.scemode= R_DOCOMP|R_DOSEQ|R_EXTENSION; - sce->r.stamp= R_STAMP_TIME|R_STAMP_FRAME|R_STAMP_DATE|R_STAMP_SCENE|R_STAMP_CAMERA; + sce->r.stamp= R_STAMP_TIME|R_STAMP_FRAME|R_STAMP_DATE|R_STAMP_SCENE|R_STAMP_CAMERA|R_STAMP_RENDERTIME; sce->r.threads= 1; diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index e36e8dc49c4..5165e570504 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -3575,18 +3575,20 @@ void seq_offset_animdata(Scene *scene, Sequence *seq, int ofs) } -Sequence *get_seq_by_name(Scene *scene, const char *name) +Sequence *get_seq_by_name(ListBase *seqbase, const char *name, int recursive) { - Sequence *seq=NULL; - Editing *ed= seq_give_editing(scene, FALSE); - - if(ed==NULL) return NULL; - - for (seq=ed->seqbase.first; seq; seq=seq->next) { - if (strcmp(name, seq->name+2) == 0) - break; + Sequence *iseq=NULL; + Sequence *rseq=NULL; + + for (iseq=seqbase->first; iseq; iseq=iseq->next) { + if (strcmp(name, iseq->name+2) == 0) + return iseq; + else if(recursive && (iseq->seqbase.first) && (rseq=get_seq_by_name(&iseq->seqbase, name, 1))) { + return rseq; + } } - return seq; + + return NULL; } diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 17dfb4f7ce6..2631a1aa219 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4289,7 +4289,6 @@ static void direct_link_scene(FileData *fd, Scene *sce) Editing *ed; Sequence *seq; MetaStack *ms; - TimeMarker *marker; sce->theDag = NULL; sce->dagisvalid = 0; diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index fc5e7e1898b..8ab2de8076e 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -778,16 +778,17 @@ static int skip_fcurve_selected_data(FCurve *fcu, ID *owner_id) } } else if (GS(owner_id->name) == ID_SCE) { - Scene *sce = (Scene *)owner_id; + Scene *scene = (Scene *)owner_id; /* only consider if F-Curve involves sequence_editor.sequences */ if ((fcu->rna_path) && strstr(fcu->rna_path, "sequences_all")) { + Editing *ed= seq_give_editing(scene, FALSE); Sequence *seq; char *seq_name; /* get strip name, and check if this strip is selected */ seq_name= BLI_getQuotedStr(fcu->rna_path, "sequences_all["); - seq = get_seq_by_name(sce, seq_name); + seq = get_seq_by_name(ed->seqbasep, seq_name, FALSE); if (seq_name) MEM_freeN(seq_name); /* can only add this F-Curve if it is selected */ diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 7227c13d374..2a9859330af 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -2339,9 +2339,6 @@ static int screen_animation_step(bContext *C, wmOperator *op, wmEvent *event) ScreenAnimData *sad= wt->customdata; ScrArea *sa; int sync; -#ifdef DURIAN_CAMERA_SWITCH - Object *camera_orig= scene->camera; -#endif /* sync, don't sync, or follow scene setting */ if(sad->flag & ANIMPLAY_FLAG_SYNC) sync= 1; diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 1876062b2b7..844bf51ae32 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -2370,7 +2370,7 @@ static EnumPropertyItem view_type_items[] = { /* view_all operator */ static int sequencer_view_toggle_exec(bContext *C, wmOperator *op) { - SpaceSeq *sseq= CTX_wm_space_data(C); + SpaceSeq *sseq= (SpaceSeq *)CTX_wm_space_data(C); sseq->view++; if (sseq->view > SEQ_VIEW_SEQUENCE_PREVIEW) sseq->view = SEQ_VIEW_SEQUENCE; diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index 188c6b2474b..c2b36ddc915 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -686,6 +686,7 @@ float RNA_property_float_get_default_index(PointerRNA *ptr, PropertyRNA *prop, i void RNA_property_string_get(PointerRNA *ptr, PropertyRNA *prop, char *value); char *RNA_property_string_get_alloc(PointerRNA *ptr, PropertyRNA *prop, char *fixedbuf, int fixedlen); +void RNA_property_string_set(PointerRNA *ptr, PropertyRNA *prop, const char *value); int RNA_property_string_length(PointerRNA *ptr, PropertyRNA *prop); // TODO: get default strings... diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 92a8945af2e..f7d3d6f419a 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -50,6 +50,7 @@ #include "BKE_writeavi.h" /* <------ should be replaced once with generic movie module */ #include "BKE_sequencer.h" #include "BKE_pointcache.h" +#include "BKE_animsys.h" /* <------ should this be here?, needed for sequencer update */ #include "MEM_guardedalloc.h" @@ -2441,7 +2442,7 @@ static void do_render_seq(Render * re) if(recurs_depth==0) { /* otherwise sequencer animation isnt updated */ - BKE_animsys_evaluate_all_animation(G.main, frame_to_float(re->scene, cfra)); + BKE_animsys_evaluate_all_animation(G.main, (float)cfra); // XXX, was frame_to_float(re->scene, cfra) } recurs_depth++; |