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

[Antonio Vazquez]

Commit: 55f7d9c127192d36e46cf8aabe2295476f01ed2b
Author: Antonio Vazquez
Date:   Mon Jan 22 09:19:21 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB55f7d9c127192d36e46cf8aabe2295476f01ed2b

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/draw/intern/draw_cache.h
index 1760a0ef448,c039bb8883d..4652f6f7458
--- a/source/blender/draw/intern/draw_cache.h
+++ b/source/blender/draw/intern/draw_cache.h
@@@ -68,11 -68,9 +68,12 @@@ struct Gwn_Batch *DRW_cache_field_vorte
  struct Gwn_Batch *DRW_cache_field_tube_limit_get(void);
  struct Gwn_Batch *DRW_cache_field_cone_limit_get(void);
  
 +/* Grease Pencil */
 +struct Gwn_Batch *DRW_cache_gpencil_axes_get(void);
 +
  /* Lamps */
  struct Gwn_Batch *DRW_cache_lamp_get(void);
+ struct Gwn_Batch *DRW_cache_lamp_shadows_get(void);
  struct Gwn_Batch *DRW_cache_lamp_sunrays_get(void);
  struct Gwn_Batch *DRW_cache_lamp_area_get(void);
  struct Gwn_Batch *DRW_cache_lamp_hemi_get(void);