[Bf-blender-cvs] [1a3bc6087c9] greasepencil-refactor: GPencil: Cleanup - Rename functions

[Antonio Vazquez]

Commit: 1a3bc6087c94dbeb16ff7c8073f1d8beb29c6fe4
Author: Antonio Vazquez
Date:   Wed Jan 8 16:28:21 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB1a3bc6087c94dbeb16ff7c8073f1d8beb29c6fe4

GPencil: Cleanup - Rename functions

===================================================================

M	source/blender/draw/engines/gpencil/gpencil_cache_utils.c
M	source/blender/draw/engines/gpencil/gpencil_engine.c
M	source/blender/draw/engines/gpencil/gpencil_engine.h

===================================================================

diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
index 108fc040485..43a7551c353 100644
--- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
@@ -42,8 +42,7 @@
 
 #include "DEG_depsgraph.h"
 
-/* TODO remove the _new suffix. */
-GPENCIL_tObject *gpencil_object_cache_add_new(GPENCIL_PrivateData *pd, Object *ob)
+GPENCIL_tObject *gpencil_object_cache_add(GPENCIL_PrivateData *pd, Object *ob)
 {
   bGPdata *gpd = (bGPdata *)ob->data;
   GPENCIL_tObject *tgp_ob = BLI_memblock_alloc(pd->gp_object_pool);
@@ -105,8 +104,7 @@ GPENCIL_tObject *gpencil_object_cache_add_new(GPENCIL_PrivateData *pd, Object *o
   return tgp_ob;
 }
 
-/* TODO remove the _new suffix. */
-GPENCIL_tLayer *gpencil_layer_cache_add_new(GPENCIL_PrivateData *pd, Object *ob, bGPDlayer *gpl)
+GPENCIL_tLayer *gpencil_layer_cache_add(GPENCIL_PrivateData *pd, Object *ob, bGPDlayer *gpl)
 {
   bGPdata *gpd = (bGPdata *)ob->data;
   GPENCIL_tLayer *tgp_layer = BLI_memblock_alloc(pd->gp_layer_pool);
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 5b2b9d0f2ee..4978c46beab 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -357,7 +357,7 @@ static void gp_layer_cache_populate(bGPDlayer *gpl,
   }
 
   GPENCIL_tLayer *tgp_layer_prev = iter->tgp_ob->layers.last;
-  GPENCIL_tLayer *tgp_layer = gpencil_layer_cache_add_new(iter->pd, iter->ob, gpl);
+  GPENCIL_tLayer *tgp_layer = gpencil_layer_cache_add(iter->pd, iter->ob, gpl);
   BLI_LINKS_APPEND(&iter->tgp_ob->layers, tgp_layer);
 
   if (tgp_layer->is_masked && (tgp_layer_prev == NULL || !tgp_layer_prev->is_masked)) {
@@ -494,7 +494,7 @@ static void gp_sbuffer_cache_populate_fast(GPENCIL_Data *vedata, gpIterPopulateD
   GPUTexture *depth_texture = iter->pd->scene_depth_tx;
   GPENCIL_tObject *last_tgp_ob = iter->pd->tobjects.last;
   /* Create another temp object that only contain the stroke. */
-  iter->tgp_ob = gpencil_object_cache_add_new(iter->pd, iter->ob);
+  iter->tgp_ob = gpencil_object_cache_add(iter->pd, iter->ob);
   /* Remove from the main list. */
   iter->pd->tobjects.last = last_tgp_ob;
   last_tgp_ob->next = NULL;
@@ -529,7 +529,7 @@ void GPENCIL_cache_populate(void *ved, Object *ob)
     gpIterPopulateData iter = {0};
     iter.ob = ob;
     iter.pd = pd;
-    iter.tgp_ob = gpencil_object_cache_add_new(pd, ob);
+    iter.tgp_ob = gpencil_object_cache_add(pd, ob);
     iter.matpool = gpencil_material_pool_create(pd, ob, &iter.mat_ofs);
     iter.tex_fill = txl->dummy_texture;
     iter.tex_stroke = txl->dummy_texture;
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index a0052ef0a6d..0fee1ee47b0 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -380,10 +380,10 @@ typedef struct GpencilBatchCache {
 /* geometry batch cache functions */
 struct GpencilBatchCache *gpencil_batch_cache_get(struct Object *ob, int cfra);
 
-GPENCIL_tObject *gpencil_object_cache_add_new(GPENCIL_PrivateData *pd, Object *ob);
-GPENCIL_tLayer *gpencil_layer_cache_add_new(GPENCIL_PrivateData *pd,
-                                            Object *ob,
-                                            struct bGPDlayer *layer);
+GPENCIL_tObject *gpencil_object_cache_add(GPENCIL_PrivateData *pd, Object *ob);
+GPENCIL_tLayer *gpencil_layer_cache_add(GPENCIL_PrivateData *pd,
+                                        Object *ob,
+                                        struct bGPDlayer *layer);
 GPENCIL_MaterialPool *gpencil_material_pool_create(GPENCIL_PrivateData *pd, Object *ob, int *ofs);
 void gpencil_material_resources_get(GPENCIL_MaterialPool *first_pool,
                                     int mat_id,