[Bf-blender-cvs] [d1fbbb1653c] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: d1fbbb1653c1667efcf1a09d0f9daa5f171b06f6
Author: Antonio Vazquez
Date:   Thu Feb 20 09:04:12 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd1fbbb1653c1667efcf1a09d0f9daa5f171b06f6

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/draw/intern/draw_cache.h
index 5ad8d840fbf,cb81bdafe62..8ac0d7ada21
--- a/source/blender/draw/intern/draw_cache.h
+++ b/source/blender/draw/intern/draw_cache.h
@@@ -45,12 -44,8 +45,11 @@@ struct GPUBatch *DRW_cache_quad_get(voi
  struct GPUBatch *DRW_cache_quad_wires_get(void);
  struct GPUBatch *DRW_cache_cube_get(void);
  struct GPUBatch *DRW_cache_sphere_get(void);
- struct GPUBatch *DRW_cache_screenspace_circle_get(void);
  struct GPUBatch *DRW_cache_normal_arrow_get(void);
  
 +/* Dummy VBOs */
 +struct GPUBatch *DRW_gpencil_dummy_buffer_get(void);
 +
  /* Common Object */
  struct GPUBatch *DRW_cache_object_all_edges_get(struct Object *ob);
  struct GPUBatch *DRW_cache_object_edge_detection_get(struct Object *ob, bool *r_is_manifold);