diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-08-24 01:50:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-08-24 05:06:58 +0300 |
| commit | 67d9647ae4e17bb14d89933e392381e01ebae6a0 (patch) | |
| tree | 6bfdf64c7cdc1b2215e571b4f86906054758925a /source/blender/draw | |
| parent | a68e8ac993a169b63365ffc099d3f01581f6ce0b (diff) | |
Cleanup: use eval as a suffix
Follow conversion already used in most places.
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_cache_utils.c | 6 | ||||
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_draw_utils.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c index ea806c3da90..33e6d73eeeb 100644 --- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c @@ -351,9 +351,9 @@ void DRW_gpencil_freecache(struct Object *ob) /* clear all frames evaluated data */ for (int i = 0; i < ob->runtime.gpencil_tot_layers; i++) { - bGPDframe *eval_gpf = &ob->runtime.gpencil_evaluated_frames[i]; - BKE_gpencil_free_frame_runtime_data(eval_gpf); - eval_gpf = NULL; + bGPDframe *gpf_eval = &ob->runtime.gpencil_evaluated_frames[i]; + BKE_gpencil_free_frame_runtime_data(gpf_eval); + gpf_eval = NULL; } ob->runtime.gpencil_tot_layers = 0; diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c index 579cf8c0974..687d2de7eef 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c @@ -1866,7 +1866,7 @@ void gpencil_populate_datablock(GPENCIL_e_data *e_data, View3D *v3d = draw_ctx->v3d; int cfra_eval = (int)DEG_get_ctime(draw_ctx->depsgraph); - bGPDframe *eval_gpf = NULL; + bGPDframe *gpf_eval = NULL; const bool overlay = v3d != NULL ? (bool)((v3d->flag2 & V3D_HIDE_OVERLAYS) == 0) : true; const bool time_remap = BKE_gpencil_has_time_modifiers(ob); @@ -1937,7 +1937,7 @@ void gpencil_populate_datablock(GPENCIL_e_data *e_data, /* Get evaluated frames array data */ int eval_idx = BLI_findindex(&gpd->layers, gpl); - eval_gpf = &ob->runtime.gpencil_evaluated_frames[eval_idx]; + gpf_eval = &ob->runtime.gpencil_evaluated_frames[eval_idx]; /* draw onion skins */ if (!ID_IS_LINKED(&gpd->id)) { @@ -1952,7 +1952,7 @@ void gpencil_populate_datablock(GPENCIL_e_data *e_data, } /* draw normal strokes */ gpencil_draw_strokes( - cache, e_data, vedata, ob, gpd, gpl, eval_gpf, opacity, gpl->tintcolor, false, cache_ob); + cache, e_data, vedata, ob, gpd, gpl, gpf_eval, opacity, gpl->tintcolor, false, cache_ob); } /* create batchs and shading groups */ |