[Bf-blender-cvs] [c1fbef93dc3] greasepencil-refactor: Cleanup: GPencil: Remove unused cache function

Clément Foucault noreply at git.blender.org
Thu Jan 9 16:00:29 CET 2020


Commit: c1fbef93dc3894e8f44feea40ecad2bb6cc64260
Author: Clément Foucault
Date:   Thu Jan 9 00:27:04 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rBc1fbef93dc3894e8f44feea40ecad2bb6cc64260

Cleanup: GPencil: Remove unused cache function

Thoses were old duplicates

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

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

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
index 075ccce1e14..26a91e27160 100644
--- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
@@ -225,79 +225,3 @@ GPENCIL_tLayer *gpencil_layer_cache_add(GPENCIL_PrivateData *pd, Object *ob, bGP
 
   return tgp_layer;
 }
-
-/* get current cache data */
-static GpencilBatchCache *gpencil_batch_get_element(Object *ob)
-{
-  return ob->runtime.gpencil_cache;
-}
-
-/* verify if cache is valid */
-static bool gpencil_batch_cache_valid(GpencilBatchCache *cache, bGPdata *gpd, int cfra)
-{
-  bool valid = true;
-  if (cache == NULL) {
-    return false;
-  }
-
-  cache->is_editmode = GPENCIL_ANY_EDIT_MODE(gpd);
-  if (cfra != cache->cache_frame) {
-    valid = false;
-  }
-  else if (gpd->flag & GP_DATA_CACHE_IS_DIRTY) {
-    valid = false;
-  }
-  else if (gpd->flag & GP_DATA_PYTHON_UPDATED) {
-    gpd->flag &= ~GP_DATA_PYTHON_UPDATED;
-    valid = false;
-  }
-  else if (cache->is_editmode) {
-    /* XXX FIXME This is bad as it means we cannot call gpencil_batch_cache_get twice in a row.
-     * Disabling for now. Edit: seems to work without it... */
-    // valid = false;
-  }
-  else if (cache->is_dirty) {
-    /* TODO, maybe get rid of the other dirty flags. */
-    valid = false;
-  }
-
-  return valid;
-}
-
-/* cache init */
-static GpencilBatchCache *gpencil_batch_cache_init(Object *ob, int cfra)
-{
-  bGPdata *gpd = (bGPdata *)ob->data;
-
-  GpencilBatchCache *cache = gpencil_batch_get_element(ob);
-
-  if (!cache) {
-    cache = MEM_callocN(sizeof(*cache), __func__);
-    ob->runtime.gpencil_cache = cache;
-  }
-  else {
-    memset(cache, 0, sizeof(*cache));
-  }
-
-  cache->is_editmode = GPENCIL_ANY_EDIT_MODE(gpd);
-
-  cache->is_dirty = true;
-
-  cache->cache_frame = cfra;
-
-  return cache;
-}
-
-/* get cache */
-GpencilBatchCache *gpencil_batch_cache_get(Object *ob, int cfra)
-{
-  bGPdata *gpd = (bGPdata *)ob->data;
-
-  GpencilBatchCache *cache = gpencil_batch_get_element(ob);
-  if (!gpencil_batch_cache_valid(cache, gpd, cfra)) {
-    return gpencil_batch_cache_init(ob, cfra);
-  }
-  else {
-    return cache;
-  }
-}



More information about the Bf-blender-cvs mailing list