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)
1  2 
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

index 66e4cae2f3e067509ff2a9a577bb85cf8a282ee2,c12a050e9ba13dad204029f0a06d00c26f0a1f04..7bf146aa1717a1feb0a03ce2d46d0906a8f41a5b
@@@ -62,7 -62,9 +62,8 @@@
  #include "DNA_material_types.h"
  #include "DNA_mesh_types.h"
  #include "DNA_meta_types.h"
+ #include "DNA_movieclip_types.h"
  #include "DNA_node_types.h"
 -#include "DNA_particle_types.h"
  #include "DNA_space_types.h"
  #include "DNA_sequence_types.h"
  #include "DNA_scene_types.h"