[Bf-blender-cvs] [43e840b947b] hair_guides: Merge branch 'blender2.8' into hair_guides

[Lukas Tönne]

Commit: 43e840b947b0597c6accbbe9326605d6dcdd4fa4
Author: Lukas Tönne
Date:   Mon Dec 18 10:19:01 2017 +0000
Branches: hair_guides
https://developer.blender.org/rB43e840b947b0597c6accbbe9326605d6dcdd4fa4

Merge branch 'blender2.8' into hair_guides

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



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

diff --cc source/blender/draw/intern/draw_cache_impl.h
index 3ac421dc98c,5188ac0bd1a..cf6c186d10a
--- a/source/blender/draw/intern/draw_cache_impl.h
+++ b/source/blender/draw/intern/draw_cache_impl.h
@@@ -29,13 -29,11 +29,14 @@@
  struct CurveCache;
  struct GPUMaterial;
  struct Gwn_Batch;
+ struct Gwn_IndexBuf;
+ struct Gwn_VertBuf;
  struct ListBase;
- struct MetaBall;
  struct ModifierData;
  struct ParticleSystem;
 +struct HairSystem;
 +struct DRWHairFiberTextureBuffer;
 +struct DerivedMesh;
  
  struct Curve;
  struct Lattice;