Merge branch 'master' into blender2.8

2018-08-31 13:40:10 +10:00
parent e3c110e72e 18d135d05c
commit 7c6136b35c
52 changed files with 2386 additions and 181 deletions
--- a/source/blender/editors/animation/anim_ops.c
+++ b/source/blender/editors/animation/anim_ops.c
@@ -536,7 +536,7 @@ void ED_operatortypes_anim(void)

 void ED_keymap_anim(wmKeyConfig *keyconf)
 {
-	wmKeyMap *keymap = WM_keymap_find(keyconf, "Animation", 0, 0);
+	wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Animation", 0, 0);
 	wmKeyMapItem *kmi;

 	/* frame management */