[Bf-blender-cvs] [6016d3b539f] greasepencil-object: Cleanup: Remove redundant parameter
Antonio Vazquez
noreply at git.blender.org
Wed Jul 26 16:30:26 CEST 2017
Commit: 6016d3b539fad32bea61aff41bd5ca25ef1a0515
Author: Antonio Vazquez
Date: Wed Jul 26 14:03:50 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6016d3b539fad32bea61aff41bd5ca25ef1a0515
Cleanup: Remove redundant parameter
===================================================================
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index be01981f7eb..fc2dea12454 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -152,12 +152,14 @@ static void gpencil_batch_cache_check_free_slots(Object *ob, bGPdata *gpd)
}
}
/* cache init */
-static void gpencil_batch_cache_init(Object *ob, bGPdata *gpd, int cfra)
+static void gpencil_batch_cache_init(Object *ob, int cfra)
{
+ GpencilBatchCache *cache = gpencil_batch_get_element(ob);
+ bGPdata *gpd = ob->gpd;
+
if (G.debug_value == 668) {
- printf("gpencil_batch_cache_init: %s\n", gpd->id.name);
+ printf("gpencil_batch_cache_init: %s\n", ob->id.name);
}
- GpencilBatchCache *cache = gpencil_batch_get_element(ob);
if (!cache) {
cache = MEM_callocN(sizeof(*cache), __func__);
@@ -219,7 +221,7 @@ static GpencilBatchCache *gpencil_batch_cache_get(Object *ob, int cfra)
if (cache) {
gpencil_batch_cache_clear(cache, gpd);
}
- gpencil_batch_cache_init(ob, gpd, cfra);
+ gpencil_batch_cache_init(ob, cfra);
}
return gpencil_batch_get_element(ob);
More information about the Bf-blender-cvs
mailing list