Commit: 08f5986d219abd3f0e216e2711468b29fbc750f9 Author: Antonioya Date: Wed Aug 15 22:11:44 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB08f5986d219abd3f0e216e2711468b29fbc750f9
GP: Revert previous commit for fixing compiler error The function must be static. The error was the definition in header file must be removed. This error was not detected by Microsoft compiler but Linux compiler fails. =================================================================== M source/blender/draw/engines/gpencil/gpencil_cache_utils.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 d3023588410..4c427a672d2 100644 --- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c @@ -152,7 +152,7 @@ tGPencilObjectCache *gpencil_object_cache_add( } /* get current cache data */ -GpencilBatchCache *gpencil_batch_get_element(Object *ob) +static GpencilBatchCache *gpencil_batch_get_element(Object *ob) { bGPdata *gpd = ob->data; if (gpd->runtime.batch_cache_data == NULL) { diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h index 40522f10b48..80a3df7bc54 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.h +++ b/source/blender/draw/engines/gpencil/gpencil_engine.h @@ -320,7 +320,6 @@ struct tGPencilObjectCache *gpencil_object_cache_add( /* geometry batch cache functions */ void gpencil_batch_cache_check_free_slots(struct Object *ob); struct GpencilBatchCache *gpencil_batch_cache_get(struct Object *ob, int cfra); -struct GpencilBatchCache *gpencil_batch_get_element(struct Object *ob); /* effects */ void GPENCIL_create_fx_shaders(struct GPENCIL_e_data *e_data); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs