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/intern/draw_anim_viz.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/intern/draw_anim_viz.c')
| -rw-r--r-- | source/blender/draw/intern/draw_anim_viz.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/draw/intern/draw_anim_viz.c b/source/blender/draw/intern/draw_anim_viz.c index 871358f815b..60dfea7be7d 100644 --- a/source/blender/draw/intern/draw_anim_viz.c +++ b/source/blender/draw/intern/draw_anim_viz.c @@ -64,8 +64,6 @@ #include "draw_mode_engines.h" -extern struct GPUUniformBuffer *globals_ubo; /* draw_common.c */ - /* ********************************* Lists ************************************** */ /* All lists are per viewport specific datas. * They are all free when viewport changes engines @@ -230,7 +228,7 @@ static void MPATH_cache_motion_path(MPATH_PassList *psl, DRW_shgroup_uniform_bool_copy(shgrp, "selected", sel); DRW_shgroup_uniform_bool_copy(shgrp, "useCustomColor", use_custom_col); DRW_shgroup_uniform_vec2(shgrp, "viewportSize", DRW_viewport_size_get(), 1); - DRW_shgroup_uniform_block(shgrp, "globalsBlock", globals_ubo); + DRW_shgroup_uniform_block(shgrp, "globalsBlock", G_draw.block_ubo); if (use_custom_col) { DRW_shgroup_uniform_vec3(shgrp, "customColor", mpath->color, 1); } @@ -247,7 +245,7 @@ static void MPATH_cache_motion_path(MPATH_PassList *psl, DRW_shgroup_uniform_bool_copy(shgrp, "selected", sel); DRW_shgroup_uniform_bool_copy(shgrp, "showKeyFrames", show_keyframes); DRW_shgroup_uniform_bool_copy(shgrp, "useCustomColor", use_custom_col); - DRW_shgroup_uniform_block(shgrp, "globalsBlock", globals_ubo); + DRW_shgroup_uniform_block(shgrp, "globalsBlock", G_draw.block_ubo); if (use_custom_col) { DRW_shgroup_uniform_vec3(shgrp, "customColor", mpath->color, 1); } |