Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sat, 15 Oct 2016 08:05:03 +0000 (10:05 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sat, 15 Oct 2016 08:05:03 +0000 (10:05 +0200)
commitfcff9843384ff72a9549cfb301bdbd418aa12d1b
tree0bf3ce1a7544072710230e219c16fd3a471c4b22
parent9632ca0a13b415a83572378862a44047e0a362e0
parent7fec7eee2070aac701f7918311a05ca2bfd1b3b0
Merge branch 'master' into blender2.8
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/include/ED_anim_api.h
source/blender/makesrna/intern/rna_userdef.c