[Bf-blender-cvs] [1f26f4f3c2a] greasepencil-refactor: GPencil: More cleanup of old code

[Antonio Vazquez]

Commit: 1f26f4f3c2ac9df0a792c5d0d0f7c6bcfc993036
Author: Antonio Vazquez
Date:   Thu Jan 9 16:38:43 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB1f26f4f3c2ac9df0a792c5d0d0f7c6bcfc993036

GPencil: More cleanup of old code

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

M       source/blender/draw/engines/gpencil/gpencil_engine.c
M       source/blender/draw/engines/gpencil/gpencil_engine.h

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c 
b/source/blender/draw/engines/gpencil/gpencil_engine.c
index aa813c9e5f8..022bc359af9 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -171,8 +171,6 @@ static void GPENCIL_engine_free(void)
   DRW_SHADER_FREE_SAFE(e_data.fx_shadow_sh);
   DRW_SHADER_FREE_SAFE(e_data.fx_transform_sh);
 
-  DRW_TEXTURE_FREE_SAFE(e_data.gpencil_blank_texture);
-
   GPU_VERTBUF_DISCARD_SAFE(e_data.quad);
 }
 
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h 
b/source/blender/draw/engines/gpencil/gpencil_engine.h
index e86a37618c0..dcc8285fa68 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -181,12 +181,6 @@ typedef struct GPENCIL_tObject {
 } GPENCIL_tObject;
 
 /* *********** LISTS *********** */
-typedef struct GPENCIL_Storage {
-  /* Render Matrices and data */
-  float view_vecs[2][4]; /* vec4[2] */
-  Object *camera;        /* camera pointer for render mode */
-} GPENCIL_Storage;
-
 typedef struct GPENCIL_StorageList {
   struct GPENCIL_PrivateData *pd;
 } GPENCIL_StorageList;
@@ -318,9 +312,6 @@ typedef struct GPENCIL_PrivateData {
 } GPENCIL_PrivateData;
 
 typedef struct GPENCIL_e_data {
-  /* textures */
-  struct GPUTexture *gpencil_blank_texture;
-
   /* SMAA antialiasing */
   struct GPUShader *antialiasing_sh[3];
   /* GPencil Object rendering */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs