blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Fix T75122: Annotations: Only visible scene annotations in dopesheet 

The loop of datablocks was using the scene datablock (3D View) only, but all others datablocks were ignored.

Now the loop consider any annotation datablock.
This commit is contained in:
Antonio Vazquez 2020-04-09 10:56:48 +02:00
parent bd59781c66
commit ee5cec4a50
Notes: blender-bot 2023-03-24 17:05:22 +01:00 
Referenced by issue #75122, Annotations: Only visible scene annotations in dopesheet
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/animation/anim_filter.c
View File

@ -1844,11 +1844,15 @@ static size_t animdata_filter_gpencil(bAnimContext *ac,
ViewLayer *view_layer = (ViewLayer *)ac->view_layer;
Base *base;
/* Active scene's GPencil block first - No parent item needed... */
if (scene->gpd) {
items += animdata_filter_gpencil_data(anim_data, ads, scene->gpd, filter_mode);
/* Include all annotation datablocks. */
if (((ads->filterflag & ADS_FILTER_ONLYSEL) == 0) ||
(ads->filterflag & ADS_FILTER_INCL_HIDDEN)) {
LISTBASE_FOREACH (bGPdata *, gpd, &ac->bmain->gpencils) {
if (gpd->flag & GP_DATA_ANNOTATIONS) {
items += animdata_filter_gpencil_data(anim_data, ads, gpd, filter_mode);
}
}
}
/* Objects in the scene */
for (base = view_layer->object_bases.first; base; base = base->next) {
/* Only consider this object if it has got some GP data (saving on all the other tests) */