diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-16 18:09:28 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-16 18:09:28 +0300 |
| commit | d96b8e168f3c809cd79f6028dbf99eeeebb71302 (patch) | |
| tree | 75ee78ee75ea602c2c698f4b4ec8494093b949c7 /source/blender/editors/include/ED_anim_api.h | |
| parent | 76c99f361f58752eff8054f5cff52cad9ce57145 (diff) | |
| parent | 4b39069908c88099860c04a3b7d3b4aae0a272f5 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include/ED_anim_api.h')
| -rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 99f9287be8f..e05f15ce7fc 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -415,7 +415,8 @@ typedef enum eAnimChannel_Settings { ACHANNEL_SETTING_VISIBLE = 4, /* only for Graph Editor */ ACHANNEL_SETTING_SOLO = 5, /* only for NLA Tracks */ ACHANNEL_SETTING_PINNED = 6, /* only for NLA Actions */ - ACHANNEL_SETTING_MOD_OFF = 7 + ACHANNEL_SETTING_MOD_OFF = 7, + ACHANNEL_SETTING_ALWAYS_VISIBLE = 8, /* channel is pinned and always visible */ } eAnimChannel_Settings; |