[Bf-blender-cvs] [b6ff712af2b] greasepencil-refactor: GPencil: Refactor: Remove last occurence of stl->storage

[Clément Foucault]

Commit: b6ff712af2ba874207d75c759ed1d823be9c3255
Author: Clément Foucault
Date:   Wed Jan 8 18:06:51 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rBb6ff712af2ba874207d75c759ed1d823be9c3255

GPencil: Refactor: Remove last occurence of stl->storage

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

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

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 0fee1ee47b0..3b83001f9be 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -189,8 +189,6 @@ typedef struct GPENCIL_Storage {
 
 typedef struct GPENCIL_StorageList {
   struct GPENCIL_PrivateData *pd;
-  /* TODO remove all below. */
-  struct GPENCIL_Storage *storage;
 } GPENCIL_StorageList;
 
 typedef struct GPENCIL_PassList {
@@ -293,6 +291,8 @@ typedef struct GPENCIL_PrivateData {
   float camera_pos[3];
   /* Pseudo depth of field parameter. Used to scale blur radius. */
   float dof_params[2];
+  /* Viewvecs to compute view Z from depth buffer. */
+  float view_vecs[2][4];
   /* Used for DoF Setup. */
   Object *camera;
 
@@ -467,7 +467,4 @@ GPENCIL_ViewLayerData *GPENCIL_view_layer_data_ensure(void);
 #define GPENCIL_3D_DRAWMODE(ob, gpd) \
   ((gpd) && (gpd->draw_mode == GP_DRAWMODE_3D) && ((ob->dtx & OB_DRAWXRAY) == 0))
 
-#define GPENCIL_USE_SOLID(stl) \
-  ((stl) && ((stl->storage->is_render) || (stl->storage->is_mat_preview)))
-
 #endif /* __GPENCIL_ENGINE_H__ */
diff --git a/source/blender/draw/engines/gpencil/gpencil_render.c b/source/blender/draw/engines/gpencil/gpencil_render.c
index fba2701397f..bf29a6698b9 100644
--- a/source/blender/draw/engines/gpencil/gpencil_render.c
+++ b/source/blender/draw/engines/gpencil/gpencil_render.c
@@ -161,7 +161,7 @@ static void GPENCIL_render_update_vecs(GPENCIL_Data *vedata)
   DRW_view_winmat_get(NULL, invproj, true);
 
   /* this is separated to keep function equal to Eevee for future reuse of same code */
-  GPENCIL_render_update_viewvecs(invproj, winmat, stl->storage->view_vecs);
+  GPENCIL_render_update_viewvecs(invproj, winmat, stl->pd->view_vecs);
 }
 
 /* read z-depth render result */
@@ -202,8 +202,7 @@ static void GPENCIL_render_result_z(struct RenderLayer *rl,
           rp->rect[i] = winmat[3][2] / (rp->rect[i] + winmat[2][2]);
         }
         else {
-          rp->rect[i] = -stl->storage->view_vecs[0][2] +
-                        rp->rect[i] * -stl->storage->view_vecs[1][2];
+          rp->rect[i] = -stl->pd->view_vecs[0][2] + rp->rect[i] * -stl->pd->view_vecs[1][2];
         }
       }
     }
@@ -272,8 +271,7 @@ void GPENCIL_render_to_image(void *vedata,
 
   GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
   Object *camera = DEG_get_evaluated_object(draw_ctx->depsgraph, RE_GetCamera(engine->re));
-  stl->storage->camera = camera; /* save current camera */
-  stl->pd->camera = camera;      /* save current camera */
+  stl->pd->camera = camera; /* save current camera */
 
   GPENCIL_cache_init(vedata);