diff options
Diffstat (limited to 'source/blender/editors/animation/keyframes_draw.c')
| -rw-r--r-- | source/blender/editors/animation/keyframes_draw.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index 00e11d8b1a4..fb1ab026e47 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -54,6 +54,7 @@ #include "DNA_key_types.h" #include "DNA_lamp_types.h" #include "DNA_lattice_types.h" +#include "DNA_linestyle_types.h" #include "DNA_mesh_types.h" #include "DNA_material_types.h" #include "DNA_meta_types.h" @@ -819,6 +820,23 @@ void scene_to_keylist(bDopeSheet *ads, Scene *sce, DLRBT_Tree *keys, DLRBT_Tree if (adt->action) action_to_keylist(adt, adt->action, keys, blocks); } + + /* linestyle animdata */ + if (sce->r.mode & R_EDGE_FRS && !(filterflag & ADS_FILTER_NOLINESTYLE)) { + SceneRenderLayer *srl; + FreestyleLineSet *lineset; + + for (srl= sce->r.layers.first; srl; srl= srl->next) { + if (srl->layflag & SCE_LAY_FRS) { + for (lineset= srl->freestyleConfig.linesets.first; lineset; lineset= lineset->next) { + adt= lineset->linestyle->adt; + + if (adt && adt->action) + action_to_keylist(adt, adt->action, keys, blocks); + } + } + } + } } } @@ -915,7 +933,7 @@ void ob_to_keylist(bDopeSheet *ads, Object *ob, DLRBT_Tree *keys, DLRBT_Tree *bl if ((lt->adt) && !(filterflag & ADS_FILTER_NOLAT)) action_to_keylist(lt->adt, lt->adt->action, keys, blocks); - } + } break; } |