[Bf-blender-cvs] [fcff984] blender2.8: Merge branch 'master' into blender2.8

Bastien Montagne noreply at git.blender.org
Sat Oct 15 10:05:34 CEST 2016


Commit: fcff9843384ff72a9549cfb301bdbd418aa12d1b
Author: Bastien Montagne
Date:   Sat Oct 15 10:05:03 2016 +0200
Branches: blender2.8
https://developer.blender.org/rBfcff9843384ff72a9549cfb301bdbd418aa12d1b

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/animation/anim_filter.c
index 66e4cae,c12a050..7bf146a
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@@ -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"




More information about the Bf-blender-cvs mailing list