griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for redundant multiple animation data items of the same line style in DopeSheet.

Browse Source 
This could happen when a line style is shared by multiple linesets within a scene.
This commit is contained in:
Tamito Kajiyama
2013-09-04 00:21:27 +00:00
parent e9182c1176
commit af9a6aad99
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1541,10 +1541,16 @@ static size_t animdata_filter_ds_nodetree(bAnimContext *ac, ListBase *anim_data,
static size_t animdata_filter_ds_linestyle(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, Scene *sce, int filter_mode)
{
SceneRenderLayer *srl;
FreestyleLineSet *lineset;
size_t items = 0;
for (srl = sce->r.layers.first; srl; srl = srl->next) {
FreestyleLineSet *lineset;
for (lineset = srl->freestyleConfig.linesets.first; lineset; lineset = lineset->next) {
lineset->linestyle->id.flag |= LIB_DOIT;
}
}
for (srl = sce->r.layers.first; srl; srl = srl->next) {
/* skip render layers without Freestyle enabled */
if (!(srl->layflag & SCE_LAY_FRS))
@@ -1555,6 +1561,10 @@ static size_t animdata_filter_ds_linestyle(bAnimContext *ac, ListBase *anim_data
FreestyleLineStyle *linestyle = lineset->linestyle;
ListBase tmp_data = {NULL, NULL};
size_t tmp_items = 0;
if (!(linestyle->id.flag & LIB_DOIT))
continue;
linestyle->id.flag &= ~LIB_DOIT;
/* add scene-level animation channels */
BEGIN_ANIMFILTER_SUBCHANNELS(FILTER_LS_SCED(linestyle))