Merged changes in the trunk up to revision 35203.
[blender.git] / source / blender / editors / animation / keyframes_edit.c
index 23c2a5a013bea7fb17f0839a06b970617008fc1f..4eb0ce2c0b365b00921a6705f4941694748e620c 100644 (file)
@@ -41,6 +41,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_object_types.h"
@@ -327,7 +328,7 @@ static short ob_keyframes_loop(KeyframeEditData *ked, Object *ob, KeyframeEditFu
                        if ((lt->adt) && !(filterflag & ADS_FILTER_NOLAT)) {
                                if (adt_keyframes_loop(ked, lt->adt, key_ok, key_cb, fcu_cb, filterflag))
                                        return 1;
-                       }
+       }
                }
                        break;
        }
@@ -376,6 +377,24 @@ static short scene_keyframes_loop(KeyframeEditData *ked, Scene *sce, KeyframeEdi
                        return 1;
        }
        
+       /* Line styles */
+       {
+               SceneRenderLayer *srl;
+               FreestyleLineSet *lineset;
+               FreestyleLineStyle *linestyle;
+
+               for (srl = (SceneRenderLayer *)sce->r.layers.first; srl; srl = srl->next) {
+                       if (srl->layflag & SCE_LAY_FRS) {
+                               for (lineset = (FreestyleLineSet *)srl->freestyleConfig.linesets.first; lineset; lineset = lineset->next) {
+                                       linestyle = lineset->linestyle;
+                                       if (linestyle->adt) {
+                                               if (adt_keyframes_loop(ked, linestyle->adt, key_ok, key_cb, fcu_cb, filterflag))
+                                                       return 1;
+                                       }
+                               }
+                       }
+               }
+       }
        
        return 0;
 }