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

[Antonio Vazquez]

Commit: 8ea8bf4dc6d7ef25bc44460ac4e9dc12b46a0c73
Author: Antonio Vazquez
Date:   Sat May 20 13:04:25 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB8ea8bf4dc6d7ef25bc44460ac4e9dc12b46a0c73

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/draw/intern/draw_cache.c
index 93858c635a6,db1565c8e96..b2c15008db7
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@@ -80,7 -80,9 +80,10 @@@ static struct DRWShapeCache 
  	Batch *drw_camera;
  	Batch *drw_camera_tria;
  	Batch *drw_camera_focus;
+ 	Batch *drw_particle_cross;
+ 	Batch *drw_particle_circle;
+ 	Batch *drw_particle_axis;
 +	Batch *drw_gpencil_axes;
  } SHC = {NULL};
  
  void DRW_shape_cache_free(void)
@@@ -125,7 -127,9 +128,10 @@@
  	BATCH_DISCARD_ALL_SAFE(SHC.drw_camera);
  	BATCH_DISCARD_ALL_SAFE(SHC.drw_camera_tria);
  	BATCH_DISCARD_ALL_SAFE(SHC.drw_camera_focus);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_particle_cross);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_particle_circle);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_particle_axis);
 +	BATCH_DISCARD_ALL_SAFE(SHC.drw_gpencil_axes);
  }