Merged changes in the trunk up to revision 46045.
[blender-staging.git] / source / blender / editors / include / ED_anim_api.h
index 391286a2a889ccab82e9edf719adfac71b8bede7..6084b4921fbe586adb6f8621c07e41952d5b17b0 100644 (file)
@@ -154,6 +154,7 @@ typedef enum eAnim_ChannelType {
        ANIMTYPE_DSMESH,
        ANIMTYPE_DSTEX,
        ANIMTYPE_DSLAT,
+       ANIMTYPE_DSLINESTYLE,
        ANIMTYPE_DSSPK,
        
        ANIMTYPE_SHAPEKEY,
@@ -231,6 +232,7 @@ typedef enum eAnimFilter_Flags {
 #define EXPANDED_SCEC(sce) ((sce->flag & SCE_DS_COLLAPSED)==0)
        /* 'Sub-Scene' channels (flags stored in Data block) */
 #define FILTER_WOR_SCED(wo) ((wo->flag & WO_DS_EXPAND))
+#define FILTER_LS_SCED(linestyle) ((linestyle->flag & LS_DS_EXPAND))
        /* 'Object' channels */
 #define SEL_OBJC(base) ((base->flag & SELECT))
 #define EXPANDED_OBJC(ob) ((ob->nlaflag & OB_ADS_COLLAPSED)==0)