diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-23 10:02:18 +0400 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-23 10:02:18 +0400 |
| commit | 0c494442d34d05ea8e0d94daefcca5902a2d6149 (patch) | |
| tree | 8c979ad3a92731656070387594123e1ef4d7082a /source/blender/include/BSE_editaction_types.h | |
| parent | 0c3f7c2b7e0c9d8ad5945029170fc8ed1f0c1eda (diff) | |
| parent | 1ffdc6679171c40ac1b2e5852ceaaa1495fbcd17 (diff) | |
soc-2008-mxcurioni: merged changes to revision 15705
Diffstat (limited to 'source/blender/include/BSE_editaction_types.h')
| -rw-r--r-- | source/blender/include/BSE_editaction_types.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/include/BSE_editaction_types.h b/source/blender/include/BSE_editaction_types.h index c531383accc..be210415973 100644 --- a/source/blender/include/BSE_editaction_types.h +++ b/source/blender/include/BSE_editaction_types.h @@ -38,7 +38,8 @@ typedef enum ALE_KEYTYPE { ALE_NONE = 0, ALE_IPO, ALE_ICU, - ALE_GROUP + ALE_GROUP, + ALE_GPFRAME, } ALE_KEYTYPE; /* This struct defines a structure used for quick access */ @@ -78,7 +79,8 @@ typedef enum ACTFILTER_FLAGS { typedef enum ACTCONT_TYPES { ACTCONT_NONE = 0, ACTCONT_ACTION, - ACTCONT_SHAPEKEY + ACTCONT_SHAPEKEY, + ACTCONT_GPENCIL } ACTCONT_TYPES; #endif |