Draw Manager: Make Viewport Data passed by the manager call.

1 files changed, 18 insertions, 19 deletions

diff --git a/source/blender/draw/modes/edit_lattice_mode.c b/source/blender/draw/modes/edit_lattice_mode.c
index 30603c2bfc3..32862ca444c 100644
--- a/source/blender/draw/modes/edit_lattice_mode.c
+++ b/source/blender/draw/modes/edit_lattice_mode.c
@@ -115,12 +115,12 @@ static struct {
 /* Init Textures, Framebuffers, Storage and Shaders.
  * It is called for every frames.
  * (Optional) */
-static void EDIT_LATTICE_engine_init(void)
+static void EDIT_LATTICE_engine_init(void *vedata)
 {
-	g_data.vedata = DRW_viewport_engine_data_get("EditLatticeMode");
-	EDIT_LATTICE_TextureList *txl = g_data.vedata->txl;
-	EDIT_LATTICE_FramebufferList *fbl = g_data.vedata->fbl;
-	EDIT_LATTICE_StorageList *stl = g_data.vedata->stl;
+
+	EDIT_LATTICE_TextureList *txl = ((EDIT_LATTICE_Data *)vedata)->txl;
+	EDIT_LATTICE_FramebufferList *fbl = ((EDIT_LATTICE_Data *)vedata)->fbl;
+	EDIT_LATTICE_StorageList *stl = ((EDIT_LATTICE_Data *)vedata)->stl;
 
 	UNUSED_VARS(txl, fbl, stl);
 
@@ -146,11 +146,11 @@ static void EDIT_LATTICE_engine_init(void)
 
 /* Here init all passes and shading groups
  * Assume that all Passes are NULL */
-static void EDIT_LATTICE_cache_init(void)
+static void EDIT_LATTICE_cache_init(void *vedata)
 {
-	g_data.vedata = DRW_viewport_engine_data_get("EditLatticeMode");
-	EDIT_LATTICE_PassList *psl = g_data.vedata->psl;
-	EDIT_LATTICE_StorageList *stl = g_data.vedata->stl;
+
+	EDIT_LATTICE_PassList *psl = ((EDIT_LATTICE_Data *)vedata)->psl;
+	EDIT_LATTICE_StorageList *stl = ((EDIT_LATTICE_Data *)vedata)->stl;
 
 	UNUSED_VARS(stl);
 
@@ -176,10 +176,10 @@ static void EDIT_LATTICE_cache_init(void)
 }
 
 /* Add geometry to shadingGroups. Execute for each objects */
-static void EDIT_LATTICE_cache_populate(Object *ob)
+static void EDIT_LATTICE_cache_populate(void *vedata, Object *ob)
 {
-	EDIT_LATTICE_PassList *psl = g_data.vedata->psl;
-	EDIT_LATTICE_StorageList *stl = g_data.vedata->stl;
+	EDIT_LATTICE_PassList *psl = ((EDIT_LATTICE_Data *)vedata)->psl;
+	EDIT_LATTICE_StorageList *stl = ((EDIT_LATTICE_Data *)vedata)->stl;
 
 	UNUSED_VARS(psl, stl);
 
@@ -193,21 +193,20 @@ static void EDIT_LATTICE_cache_populate(Object *ob)
 }
 
 /* Optional: Post-cache_populate callback */
-static void EDIT_LATTICE_cache_finish(void)
+static void EDIT_LATTICE_cache_finish(void *vedata)
 {
-	EDIT_LATTICE_PassList *psl = g_data.vedata->psl;
-	EDIT_LATTICE_StorageList *stl = g_data.vedata->stl;
+	EDIT_LATTICE_PassList *psl = ((EDIT_LATTICE_Data *)vedata)->psl;
+	EDIT_LATTICE_StorageList *stl = ((EDIT_LATTICE_Data *)vedata)->stl;
 
 	/* Do something here! dependant on the objects gathered */
 	UNUSED_VARS(psl, stl);
 }
 
 /* Draw time ! Control rendering pipeline from here */
-static void EDIT_LATTICE_draw_scene(void)
+static void EDIT_LATTICE_draw_scene(void *vedata)
 {
-	EDIT_LATTICE_Data *ved = DRW_viewport_engine_data_get("EditLatticeMode");
-	EDIT_LATTICE_PassList *psl = ved->psl;
-	EDIT_LATTICE_FramebufferList *fbl = ved->fbl;
+	EDIT_LATTICE_PassList *psl = ((EDIT_LATTICE_Data *)vedata)->psl;
+	EDIT_LATTICE_FramebufferList *fbl = ((EDIT_LATTICE_Data *)vedata)->fbl;
 
 	/* Default framebuffer and texture */
 	DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();