Merge branch 'master' into blender2.8

2016-09-16 17:09:28 +02:00
parent 76c99f361f 4b39069908
commit d96b8e168f
153 changed files with 69529 additions and 1338 deletions
--- 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;