diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-12-17 14:16:28 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-12-17 14:16:28 +0300 |
| commit | 88d72e796a388afe79d4dc8d4aed243a49ed1875 (patch) | |
| tree | 9857001a08454607f467bf61d8ce2b1a52833653 /source/blender/editors | |
| parent | e3a1d044d68000a2e81b662c0cf15bbe17698aa4 (diff) | |
remove warnings. Sequencer selection for fcurve view didnt work in metastrips.
- added RNA_property_string_set to the RNA_access.h
- include BKE_animsys.h in pipeline.c for sequencer update, hope these are ok.
Diffstat (limited to 'source/blender/editors')
| -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 |
3 files changed, 4 insertions, 6 deletions
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; |