Revision: 59787
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59787
Author: kjym3
Date: 2013-09-04 00:21:27 +0000 (Wed, 04 Sep 2013)
Log Message:
-----------
Fix for redundant multiple animation data items of the same line style in
DopeSheet.
This could happen when a line style is shared by multiple linesets within a
scene.
Modified Paths:
--------------
trunk/blender/source/blender/editors/animation/anim_filter.c
Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_filter.c
2013-09-03 22:50:58 UTC (rev 59786)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c
2013-09-04 00:21:27 UTC (rev 59787)
@@ -1541,10 +1541,16 @@
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 @@
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))
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
