diff options
| -rw-r--r-- | source/blender/blenkernel/intern/gpencil_modifier.c | 8 | ||||
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_draw_utils.c | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c index 354dddec11f..7b5f721cc50 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier.c +++ b/source/blender/blenkernel/intern/gpencil_modifier.c @@ -813,8 +813,10 @@ static void gpencil_frame_copy_noalloc(Object *ob, bGPDframe *gpf, bGPDframe *ev } /* Ensure there is a evaluated frame */ -static void gpencil_evaluated_frame_ensure( - int idx, Object *ob, bGPDlayer *gpl, bGPDframe *gpf, bGPDframe **eval_gpf) +static void gpencil_evaluated_frame_ensure(int idx, + Object *ob, + bGPDframe *gpf, + bGPDframe **eval_gpf) { /* Create evaluated frames array data or expand. */ bGPDframe *evaluated_frames = ob->runtime.gpencil_evaluated_frames; @@ -879,7 +881,7 @@ void BKE_gpencil_modifiers_calc(Depsgraph *depsgraph, Scene *scene, Object *ob) /* Create a duplicate data set of stroke to modify. */ bGPDframe *eval_gpf = NULL; - gpencil_evaluated_frame_ensure(idx, ob, gpl, gpf, &eval_gpf); + gpencil_evaluated_frame_ensure(idx, ob, gpf, &eval_gpf); /* Skip all if some disable flag is enabled. */ if ((ob->greasepencil_modifiers.first == NULL) || (is_multiedit) || (simplify_modif)) { diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c index 1dd1fa87612..579cf8c0974 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c @@ -65,8 +65,7 @@ static void gpencil_calc_vertex(GPENCIL_StorageList *stl, tGPencilObjectCache *cache_ob, GpencilBatchCache *cache, - bGPdata *gpd, - int cfra_eval) + bGPdata *gpd) { if (!cache->is_dirty) { return; @@ -1797,7 +1796,7 @@ void gpencil_populate_multiedit(GPENCIL_e_data *e_data, const bool playing = stl->storage->is_playing; /* calc max size of VBOs */ - gpencil_calc_vertex(stl, cache_ob, cache, gpd, cfra_eval); + gpencil_calc_vertex(stl, cache_ob, cache, gpd); /* draw strokes */ for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) { @@ -1887,7 +1886,7 @@ void gpencil_populate_datablock(GPENCIL_e_data *e_data, } /* calc max size of VBOs */ - gpencil_calc_vertex(stl, cache_ob, cache, gpd, cfra_eval); + gpencil_calc_vertex(stl, cache_ob, cache, gpd); /* draw normal strokes */ for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) { |