Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 25 Feb 2017 23:15:59 +0000 (00:15 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 25 Feb 2017 23:15:59 +0000 (00:15 +0100)
1  2 
source/blender/alembic/intern/abc_util.cc
source/blender/alembic/intern/abc_util.h
source/blender/alembic/intern/alembic_capi.cc
source/blender/blenkernel/intern/effect.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/creator_args.c

index bb375eb956156c876fdf7493911b3f47d90c7609,50fa43a349183c018a60a18d25d20e3910739903..5b45dff4b7f2226bc9498dc6f150bc60962b55c4
  
  extern "C" {
  #include "DNA_object_types.h"
 +#include "DNA_layer_types.h"
  
  #include "BLI_math.h"
+ #include "PIL_time.h"
  }
  
  std::string get_id_name(Object *ob)
Simple merge