diff options
author | Daniel Stokes <kupomail@gmail.com> | 2013-10-14 00:59:55 +0400 |
---|---|---|
committer | Daniel Stokes <kupomail@gmail.com> | 2013-10-14 00:59:55 +0400 |
commit | 0aa392d2ff4cc29f2e53485a6456a7deb838e1bb (patch) | |
tree | 50aa44367f0df077be6115c1f9deb85656018d4d /source/blender/editors/animation/anim_filter.c | |
parent | 6167313105cd0b65ba777459ce9333ac51e0cb3b (diff) | |
parent | 2ce3bd0d672e7e26e1a8710444872ad6478a7565 (diff) |
Merged revisions 60248-60717 from trunk/blendersoc-2013-bge
Diffstat (limited to 'source/blender/editors/animation/anim_filter.c')
-rw-r--r-- | source/blender/editors/animation/anim_filter.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 041a2c2216e..09b6e7d2206 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1546,7 +1546,9 @@ static size_t animdata_filter_ds_linestyle(bAnimContext *ac, ListBase *anim_data for (srl = sce->r.layers.first; srl; srl = srl->next) { for (lineset = srl->freestyleConfig.linesets.first; lineset; lineset = lineset->next) { - lineset->linestyle->id.flag |= LIB_DOIT; + if (lineset->linestyle) { + lineset->linestyle->id.flag |= LIB_DOIT; + } } } @@ -1562,8 +1564,11 @@ static size_t animdata_filter_ds_linestyle(bAnimContext *ac, ListBase *anim_data ListBase tmp_data = {NULL, NULL}; size_t tmp_items = 0; - if (!(linestyle->id.flag & LIB_DOIT)) + if ((linestyle == NULL) || + !(linestyle->id.flag & LIB_DOIT)) + { continue; + } linestyle->id.flag &= ~LIB_DOIT; /* add scene-level animation channels */ |