diff options
author | Antonioya <blendergit@gmail.com> | 2019-08-14 11:29:21 +0300 |
---|---|---|
committer | Antonioya <blendergit@gmail.com> | 2019-08-14 11:30:58 +0300 |
commit | c9acc5faad08422e07be59fc160a028a45b7440c (patch) | |
tree | 63e274cb312a6e9a7550b79ed961341ebd45988a /source | |
parent | b3c3c835609ef4f73d8131483d178a35287bf1eb (diff) |
Fix T68597: GPencil Dope Sheet can fail to display active GP object
Now, the dopesheet is activated if the object is in any Edition mode.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/animation/anim_filter.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 625a52fc800..a78a63f1347 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1829,13 +1829,13 @@ static size_t animdata_filter_gpencil(bAnimContext *ac, } } - /* check selection and object type filters */ - if ((ads->filterflag & ADS_FILTER_ONLYSEL) && - !((base->flag & BASE_SELECTED) /*|| (base == scene->basact)*/)) { - /* only selected should be shown */ - continue; + /* check selection and object type filters only for Object mode */ + if (ob->mode == OB_MODE_OBJECT) { + if ((ads->filterflag & ADS_FILTER_ONLYSEL) && !((base->flag & BASE_SELECTED))) { + /* only selected should be shown */ + continue; + } } - /* check if object belongs to the filtering group if option to filter * objects by the grouped status is on * - used to ease the process of doing multiple-character choreographies |