diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
| commit | a462d69bbf771e49d2fa49589608c375376b42ed (patch) | |
| tree | 60d85d4131399a0a39dbc582e30a7144b14edc18 /source/blender/makesdna/DNA_action_types.h | |
| parent | d433cd65f7127d60e17d05a824290423ad226eae (diff) | |
Another big patch set by Bastien Montagne, thanks a lot!
* Made Freestyle optional (turned on by default).
* Fix for missing bpath.c updates in the previous merge of trunk changes.
Diffstat (limited to 'source/blender/makesdna/DNA_action_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 94d8ed00cf7..3f6e6c59137 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -556,7 +556,9 @@ typedef enum eDopeSheet_FilterFlag { ADS_FILTER_NONTREE = (1 << 19), ADS_FILTER_NOTEX = (1 << 20), ADS_FILTER_NOSPK = (1 << 21), +/* #ifdef WITH_FREESTYLE */ ADS_FILTER_NOLINESTYLE = (1 << 22), +/* #endif */ /* NLA-specific filters */ ADS_FILTER_NLA_NOACT = (1 << 25), /* if the AnimData block has no NLA data, don't include to just show Action-line */ |