[Bf-blender-cvs] [e23ea999a66] greasepencil-object: Merge branch 'gp_stencil' into greasepencil-object

[Antonioya]

Commit: e23ea999a664e5208eb8fa9617f14fa366bc4ccb
Author: Antonioya
Date:   Sat Jun 22 17:55:05 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBe23ea999a664e5208eb8fa9617f14fa366bc4ccb

Merge branch 'gp_stencil' into greasepencil-object

 Conflicts:
	source/blender/draw/engines/gpencil/gpencil_draw_utils.c
	source/blender/draw/engines/gpencil/gpencil_engine.c

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



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

diff --cc source/blender/draw/engines/gpencil/gpencil_engine.h
index dd45951b335,258455753db..fa842e2b0cb
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@@ -299,36 -340,63 +326,8 @@@ typedef struct GPENCIL_e_data 
    struct GPUShader *gpencil_fx_swirl_sh;
    struct GPUShader *gpencil_fx_wave_sh;
  
-   /* textures */
-   struct GPUTexture *background_depth_tx;
-   struct GPUTexture *background_color_tx;
- 
-   struct GPUTexture *gpencil_blank_texture;
- 
-   /* runtime pointers texture */
-   struct GPUTexture *input_depth_tx;
-   struct GPUTexture *input_color_tx;
- 
-   /* working textures */
-   struct GPUTexture *temp_color_tx_a;
-   struct GPUTexture *temp_depth_tx_a;
- 
-   struct GPUTexture *temp_color_tx_b;
-   struct GPUTexture *temp_depth_tx_b;
- 
-   struct GPUTexture *temp_color_tx_fx;
-   struct GPUTexture *temp_depth_tx_fx;
- 
-   /* for buffer only one batch is nedeed because the drawing is only of one stroke */
-   GPUBatch *batch_buffer_stroke;
-   GPUBatch *batch_buffer_fill;
-   GPUBatch *batch_buffer_ctrlpoint;
- 
-   /* grid geometry */
-   GPUBatch *batch_grid;
- 
  } GPENCIL_e_data; /* Engine data */
  
 -/* GPUBatch Cache */
 -typedef struct GpencilBatchCacheElem {
 -  GPUBatch *batch;
 -  GPUVertBuf *vbo;
 -  int vbo_len;
 -  /* attr ids */
 -  GPUVertFormat format;
 -  uint pos_id;
 -  uint color_id;
 -  uint thickness_id;
 -  uint uvdata_id;
 -  uint prev_pos_id;
 -
 -  /* size for VBO alloc */
 -  int tot_vertex;
 -} GpencilBatchCacheElem;
 -
 -typedef struct GpencilBatchGroup {
 -  bGPDlayer *gpl;  /* reference to original layer */
 -  bGPDframe *gpf;  /* reference to original frame */
 -  bGPDstroke *gps; /* reference to original stroke */
 -  short type;      /* type of element */
 -  bool onion;      /* the group is part of onion skin */
 -  int vertex_idx;  /* index of vertex data */
 -} GpencilBatchGroup;
 -
 -typedef enum GpencilBatchGroup_Type {
 -  eGpencilBatchGroupType_Stroke = 1,
 -  eGpencilBatchGroupType_Point = 2,
 -  eGpencilBatchGroupType_Fill = 3,
 -  eGpencilBatchGroupType_Edit = 4,
 -  eGpencilBatchGroupType_Edlin = 5,
 -} GpencilBatchGroup_Type;
 -
 -typedef struct GpencilBatchCache {
 -  GpencilBatchCacheElem b_stroke;
 -  GpencilBatchCacheElem b_point;
 -  GpencilBatchCacheElem b_fill;
 -  GpencilBatchCacheElem b_edit;
 -  GpencilBatchCacheElem b_edlin;
 -
 -  /* settings to determine if cache is invalid */
 -  bool is_dirty;
 -  bool is_editmode;
 -  int cache_frame;
 -
 -  /* data with the shading groups */
 -  int grp_used;                        /* total groups in arrays */
 -  int grp_size;                        /* max size of the array */
 -  struct GpencilBatchGroup *grp_cache; /* array of elements */
 -
 -  int tot_layers;
 -  struct bGPDframe *derived_array; /* runtime data created by modifiers */
 -} GpencilBatchCache;
 -
  /* general drawing functions */
  struct DRWShadingGroup *DRW_gpencil_shgroup_stroke_create(struct GPENCIL_e_data *e_data,
                                                            struct GPENCIL_Data *vedata,