diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-02-28 19:11:54 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-03-01 05:53:25 +0300 |
| commit | 725112cce73a3ea314c8969459899bb8281c36ae (patch) | |
| tree | db14c0304fdf8bfd6da6eab3d7fad17e32f72aa2 /source/blender/draw/intern/draw_manager_data.c | |
| parent | 64e35f6fd21fbadb68624529ef36a2ddf82640f5 (diff) | |
DRW: Codestyle: Remove DRWCallHeader and DRWCallGenerate
Diffstat (limited to 'source/blender/draw/intern/draw_manager_data.c')
| -rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index 12ca1df74f2..4b7b60c17a5 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -293,13 +293,13 @@ void DRW_shgroup_call_add(DRWShadingGroup *shgroup, Gwn_Batch *geom, float (*obm DRWCall *call = BLI_mempool_alloc(DST.vmempool->calls); call->state = drw_call_state_create(shgroup, obmat, NULL); - call->head.type = DRW_CALL_SINGLE; + call->type = DRW_CALL_SINGLE; #ifdef USE_GPU_SELECT - call->head.select_id = DST.select_id; + call->select_id = DST.select_id; #endif - call->geometry = geom; + call->single.geometry = geom; - BLI_LINKS_APPEND(&shgroup->calls, (DRWCallHeader *)call); + BLI_LINKS_APPEND(&shgroup->calls, call); } /* These calls can be culled and are optimized for redraw */ @@ -310,13 +310,13 @@ void DRW_shgroup_call_object_add(DRWShadingGroup *shgroup, Gwn_Batch *geom, Obje DRWCall *call = BLI_mempool_alloc(DST.vmempool->calls); call->state = drw_call_state_object(shgroup, ob->obmat, ob->data); - call->head.type = DRW_CALL_SINGLE; + call->type = DRW_CALL_SINGLE; #ifdef USE_GPU_SELECT - call->head.select_id = DST.select_id; + call->select_id = DST.select_id; #endif - call->geometry = geom; + call->single.geometry = geom; - BLI_LINKS_APPEND(&shgroup->calls, (DRWCallHeader *)call); + BLI_LINKS_APPEND(&shgroup->calls, call); } void DRW_shgroup_call_generate_add( @@ -327,16 +327,16 @@ void DRW_shgroup_call_generate_add( BLI_assert(geometry_fn != NULL); BLI_assert(shgroup->type == DRW_SHG_NORMAL); - DRWCallGenerate *call = BLI_mempool_alloc(DST.vmempool->calls); + DRWCall *call = BLI_mempool_alloc(DST.vmempool->calls); call->state = drw_call_state_create(shgroup, obmat, NULL); - call->head.type = DRW_CALL_GENERATE; + call->type = DRW_CALL_GENERATE; #ifdef USE_GPU_SELECT - call->head.select_id = DST.select_id; + call->select_id = DST.select_id; #endif - call->geometry_fn = geometry_fn; - call->user_data = user_data; + call->generate.geometry_fn = geometry_fn; + call->generate.user_data = user_data; - BLI_LINKS_APPEND(&shgroup->calls, (DRWCallHeader *)call); + BLI_LINKS_APPEND(&shgroup->calls, call); } static void sculpt_draw_cb( |