diff options
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 6 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_resources.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index e288963553e..7ce25b11f93 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -155,7 +155,9 @@ typedef enum eAnim_ChannelType { ANIMTYPE_DSMESH, ANIMTYPE_DSTEX, ANIMTYPE_DSLAT, +#ifdef WITH_FREESTYLE ANIMTYPE_DSLINESTYLE, +#endif ANIMTYPE_DSSPK, ANIMTYPE_SHAPEKEY, @@ -237,7 +239,9 @@ typedef enum eAnimFilter_Flags { #define EXPANDED_SCEC(sce) (CHECK_TYPE_INLINE(sce, Scene), ((sce->flag & SCE_DS_COLLAPSED) == 0)) /* 'Sub-Scene' channels (flags stored in Data block) */ #define FILTER_WOR_SCED(wo) (CHECK_TYPE_INLINE(wo, World), (wo->flag & WO_DS_EXPAND)) -#define FILTER_LS_SCED(linestyle) ((linestyle->flag & LS_DS_EXPAND)) +#ifdef WITH_FREESTYLE +# define FILTER_LS_SCED(linestyle) ((linestyle->flag & LS_DS_EXPAND)) +#endif /* 'Object' channels */ #define SEL_OBJC(base) (CHECK_TYPE_INLINE(base, Base), ((base->flag & SELECT))) #define EXPANDED_OBJC(ob) (CHECK_TYPE_INLINE(ob, Object), ((ob->nlaflag & OB_ADS_COLLAPSED) == 0)) diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index a43e1705101..bbc9ca3502d 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -200,8 +200,10 @@ enum { TH_STITCH_PREVIEW_UNSTITCHABLE, TH_STITCH_PREVIEW_ACTIVE, +#ifdef WITH_FREESTYLE TH_FREESTYLE_EDGE_MARK, TH_FREESTYLE_FACE_MARK, +#endif TH_MATCH, /* highlight color for search matches */ TH_SELECT_HIGHLIGHT, /* highlight color for selected outliner item */ |