diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-22 04:09:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-22 04:09:27 +0300 |
| commit | 7f40d553f90358c5383100f4f5b5e2410dcd7369 (patch) | |
| tree | dab3bd1aa664ea46101fa0e68de171e92fb0ff53 /source/blender/draw/modes/particle_mode.c | |
| parent | c7768bcf4b116aa515890feed2f3019a2d9c55f4 (diff) | |
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`.
Diffstat (limited to 'source/blender/draw/modes/particle_mode.c')
| -rw-r--r-- | source/blender/draw/modes/particle_mode.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/draw/modes/particle_mode.c b/source/blender/draw/modes/particle_mode.c index 758218fe329..e861e021b27 100644 --- a/source/blender/draw/modes/particle_mode.c +++ b/source/blender/draw/modes/particle_mode.c @@ -50,8 +50,6 @@ extern char datatoc_particle_strand_vert_glsl[]; extern char datatoc_particle_strand_frag_glsl[]; extern char datatoc_common_globals_lib_glsl[]; -extern struct GPUUniformBuffer *globals_ubo; /* draw_common.c */ - /* *********** LISTS *********** */ typedef struct PARTICLE_PassList { @@ -147,9 +145,9 @@ static void particle_cache_init(void *vedata) stl->g_data->inner_points_group = DRW_shgroup_create(e_data.points_shader, psl->psys_edit_pass); stl->g_data->tip_points_group = DRW_shgroup_create(e_data.points_shader, psl->psys_edit_pass); - DRW_shgroup_uniform_block(stl->g_data->strands_group, "globalsBlock", globals_ubo); - DRW_shgroup_uniform_block(stl->g_data->inner_points_group, "globalsBlock", globals_ubo); - DRW_shgroup_uniform_block(stl->g_data->tip_points_group, "globalsBlock", globals_ubo); + DRW_shgroup_uniform_block(stl->g_data->strands_group, "globalsBlock", G_draw.block_ubo); + DRW_shgroup_uniform_block(stl->g_data->inner_points_group, "globalsBlock", G_draw.block_ubo); + DRW_shgroup_uniform_block(stl->g_data->tip_points_group, "globalsBlock", G_draw.block_ubo); } static void particle_edit_cache_populate(void *vedata, |