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

[Brecht Van Lommel]

Commit: 3102bf28890c06b03cf7455604ec00fd1e27e89c
Author: Brecht Van Lommel
Date:   Wed Feb 14 15:16:50 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB3102bf28890c06b03cf7455604ec00fd1e27e89c

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index 279068c440e,6ddc12e435b..3f6bb5b9954
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -313,8 -298,10 +313,9 @@@ set(SR
  	BKE_writeavi.h
  	BKE_writeframeserver.h
  
 -	depsgraph_private.h
  	nla_private.h
  	tracking_private.h
+ 	particle_private.h
  	intern/CCGSubSurf.h
  	intern/CCGSubSurf_inline.h
  	intern/CCGSubSurf_intern.h
diff --cc source/blender/blenkernel/intern/particle.c
index d227ea55816,2b5c293932a..daab16959d1
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@@ -85,11 -86,10 +85,13 @@@
  #include "BKE_scene.h"
  #include "BKE_deform.h"
  
 +#include "DEG_depsgraph.h"
 +#include "DEG_depsgraph_build.h"
 +
  #include "RE_render_ext.h"
  
+ #include "particle_private.h"
+ 
  unsigned int PSYS_FRAND_SEED_OFFSET[PSYS_FRAND_COUNT];
  unsigned int PSYS_FRAND_SEED_MULTIPLIER[PSYS_FRAND_COUNT];
  float PSYS_FRAND_BASE[PSYS_FRAND_COUNT];
diff --cc source/blender/gpu/intern/gpu_draw.c
index e4f121d03de,d7e744951c4..ca569d68dee
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@@ -38,7 -38,10 +38,8 @@@
  
  #include <string.h>
  
 -#include "GPU_glew.h"
 -
  #include "BLI_blenlib.h"
+ #include "BLI_hash.h"
  #include "BLI_linklist.h"
  #include "BLI_math.h"
  #include "BLI_threads.h"