Merged changes in the trunk up to revision 35203.
[blender.git] / source / blender / editors / animation / keyframes_draw.c
index fb09b8d5c85201f37aaeb43dadbd65c1eead6fae..a2072a60edffc1081ce52cd0936af4afdcb91a15 100644 (file)
@@ -49,6 +49,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"
@@ -785,6 +786,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);
+                                       }
+                               }
+                       }
+               }
        }
 }
 
@@ -881,7 +899,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;
        }