diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-02-28 06:04:40 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-03-01 05:53:25 +0300 |
| commit | 1ba96857d1ea50d97d0b305c270414ac4df5ac16 (patch) | |
| tree | ddaa57b92c1f87ef23b33d289aa7980e7c03fae7 /source/blender/draw/intern/draw_manager_exec.c | |
| parent | d1da7dba47b6d520fd9fc93d0aa327144d7fc6ae (diff) | |
DRW: Merge calls_generate pool with calls pool & add DRWCallState pool.
Diffstat (limited to 'source/blender/draw/intern/draw_manager_exec.c')
| -rw-r--r-- | source/blender/draw/intern/draw_manager_exec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 251370d2050..f5284a1376f 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -667,11 +667,11 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state) else { bool prev_neg_scale = false; for (DRWCall *call = (DRWCall *)shgroup->calls.first; call; call = (DRWCall *)call->head.next) { - if ((call->state.flag & DRW_CALL_CULLED) != 0) + if ((call->state->flag & DRW_CALL_CULLED) != 0) continue; /* Negative scale objects */ - bool neg_scale = call->state.flag & DRW_CALL_NEGSCALE; + bool neg_scale = call->state->flag & DRW_CALL_NEGSCALE; if (neg_scale != prev_neg_scale) { glFrontFace((neg_scale) ? DST.backface : DST.frontface); prev_neg_scale = neg_scale; @@ -680,13 +680,13 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state) GPU_SELECT_LOAD_IF_PICKSEL_CALL(call); if (call->head.type == DRW_CALL_SINGLE) { - draw_geometry_prepare(shgroup, &call->state); + draw_geometry_prepare(shgroup, call->state); draw_geometry_execute(shgroup, call->geometry); } else { BLI_assert(call->head.type == DRW_CALL_GENERATE); DRWCallGenerate *callgen = ((DRWCallGenerate *)call); - draw_geometry_prepare(shgroup, &callgen->state); + draw_geometry_prepare(shgroup, callgen->state); callgen->geometry_fn(shgroup, draw_geometry_execute, callgen->user_data); } } |