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

[Brecht Van Lommel]

Commit: 3cf2821f2f09d3c55dd88c2b6fb3b26e1ff69a7e
Author: Brecht Van Lommel
Date:   Sun Feb 26 00:15:59 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB3cf2821f2f09d3c55dd88c2b6fb3b26e1ff69a7e

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/alembic/intern/abc_util.cc
index bb375eb956,50fa43a349..5b45dff4b7
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@@ -35,9 -35,10 +35,11 @@@
  
  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)