From 7f40d553f90358c5383100f4f5b5e2410dcd7369 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 22 Jan 2019 12:09:27 +1100 Subject: Cleanp: use single global for draw manager Add 'G_draw' for all draw manager globals, avoids adding extern to each file. Connection between `ts` and `globals_ubo` wasn't obvious, now called `G_draw.block` & `G_draw.block_ubo`. --- source/blender/draw/engines/eevee/eevee_lightprobes.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source/blender/draw/engines/eevee/eevee_lightprobes.c') diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index 52bc4b9c55f..a9e51b8ebe8 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -65,7 +65,6 @@ static struct { struct GPUVertFormat *format_probe_display_planar; } e_data = {NULL}; /* Engine data */ -extern GlobalsUboStorage ts; /* *********** FUNCTIONS *********** */ @@ -316,7 +315,7 @@ void EEVEE_lightprobes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedat Scene *scene = draw_ctx->scene; World *wo = scene->world; - float *col = ts.colorBackground; + const float *col = G_draw.block.colorBackground; /* LookDev */ EEVEE_lookdev_cache_init(vedata, &grp, psl->probe_background, wo, pinfo); -- cgit v1.2.3