[Bf-blender-cvs] [b3a0b423a69] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: b3a0b423a6936b5357383f5997c6bc55e2d082a2
Author: Antonio Vazquez
Date:   Fri Nov 17 16:27:55 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb3a0b423a6936b5357383f5997c6bc55e2d082a2

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/draw/intern/draw_cache_impl.h

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



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

diff --cc source/blender/draw/intern/draw_cache_impl.h
index abc076cba16,c998282ae1f..09642154893
--- a/source/blender/draw/intern/draw_cache_impl.h
+++ b/source/blender/draw/intern/draw_cache_impl.h
@@@ -26,13 -26,13 +26,18 @@@
  #ifndef __DRAW_CACHE_IMPL_H__
  #define __DRAW_CACHE_IMPL_H__
  
++<<<<<<< HEAD
 +struct bGPdata;
 +struct Gwn_Batch;
++=======
+ struct CurveCache;
++>>>>>>> blender2.8
  struct GPUMaterial;
+ struct Gwn_Batch;
  struct ListBase;
- struct CurveCache;
- struct ParticleSystem;
+ struct MetaBall;
  struct ModifierData;
+ struct ParticleSystem;
  
  struct Curve;
  struct Lattice;