diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-23 04:23:11 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-23 04:23:11 +0400 |
| commit | 40449b1994301081f96d014df626a5375e020c76 (patch) | |
| tree | 20220d8b071310fda8a0ab851c7a8f7bcc3ed8a2 /source/blender/editors/animation/anim_filter.c | |
| parent | fa0211df269a3398dd70467982f9e129c79e501b (diff) | |
| parent | 3ca00cbf541d0283e91dc454866a5f24576271be (diff) | |
Merged changes in the trunk up to revision 53280.
Diffstat (limited to 'source/blender/editors/animation/anim_filter.c')
| -rw-r--r-- | source/blender/editors/animation/anim_filter.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 23d35c80409..37fd05f75a5 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -293,7 +293,7 @@ static short nlaedit_get_context(bAnimContext *ac, SpaceNla *snla) short ANIM_animdata_context_getdata(bAnimContext *ac) { SpaceLink *sl = ac->sl; - short ok = 0; + short ok = FALSE; /* context depends on editor we are currently in */ if (sl) { @@ -322,10 +322,7 @@ short ANIM_animdata_context_getdata(bAnimContext *ac) } /* check if there's any valid data */ - if (ok && ac->data) - return 1; - else - return 0; + return (ok && ac->data); } /* Obtain current anim-data context from Blender Context info @@ -357,6 +354,7 @@ short ANIM_animdata_get_context(const bContext *C, bAnimContext *ac) ac->regiontype = (ar) ? ar->regiontype : 0; /* get data context info */ + // XXX: if the below fails, try to grab this info from context instead... (to allow for scripting) return ANIM_animdata_context_getdata(ac); } @@ -931,14 +929,14 @@ static short skip_fcurve_selected_data(bDopeSheet *ads, FCurve *fcu, ID *owner_i Editing *ed = BKE_sequencer_editing_get(scene, FALSE); Sequence *seq = NULL; char *seq_name; - + if (ed) { /* get strip name, and check if this strip is selected */ seq_name = BLI_str_quoted_substrN(fcu->rna_path, "sequences_all["); seq = BKE_sequence_get_by_name(ed->seqbasep, seq_name, FALSE); if (seq_name) MEM_freeN(seq_name); } - + /* can only add this F-Curve if it is selected */ if (ads->filterflag & ADS_FILTER_ONLYSEL) { if ((seq == NULL) || (seq->flag & SELECT) == 0) @@ -2214,7 +2212,7 @@ static size_t animdata_filter_dopesheet_scene(bAnimContext *ac, ListBase *anim_d if ((ntree) && !(ads->filterflag & ADS_FILTER_NONTREE)) { tmp_items += animdata_filter_ds_nodetree(ac, &tmp_data, ads, (ID *)sce, ntree, filter_mode); } - + #ifdef WITH_FREESTYLE /* line styles */ if ((ads->filterflag & ADS_FILTER_NOLINESTYLE) == 0) { |