Commit: c2c8a3ecfd7a8fbf2894541ec33412e091dc2dac Author: Antonio Vazquez Date: Fri Mar 6 17:37:03 2020 +0100 Branches: greasepencil-object https://developer.blender.org/rBc2c8a3ecfd7a8fbf2894541ec33412e091dc2dac
GPencil: Remove unused DRW_gpencil_freecache() function This free function was used in the old implementation, but in the new produces crashes when deleting an object. =================================================================== M source/blender/blenkernel/intern/object.c M source/blender/draw/DRW_engine.h M source/blender/draw/intern/draw_cache_impl_gpencil.c =================================================================== diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 68e7e2e3b6f..211cb633881 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -734,9 +734,6 @@ void BKE_object_free_derived_caches(Object *ob) BKE_gpencil_eval_delete(ob->runtime.gpd_eval); ob->runtime.gpd_eval = NULL; } -#if 0 // GPXX - DRW_gpencil_freecache(ob); -#endif } void BKE_object_free_caches(Object *object) diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h index 2462603632f..73117d0ca1e 100644 --- a/source/blender/draw/DRW_engine.h +++ b/source/blender/draw/DRW_engine.h @@ -129,7 +129,6 @@ void DRW_draw_select_id(struct Depsgraph *depsgraph, /* grease pencil render */ bool DRW_render_check_grease_pencil(struct Depsgraph *depsgraph); void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph); -void DRW_gpencil_freecache(struct Object *ob); /* This is here because GPUViewport needs it */ struct DRWInstanceDataList *DRW_instance_data_list_create(void); diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.c b/source/blender/draw/intern/draw_cache_impl_gpencil.c index 3f575066400..2d6e12f7e88 100644 --- a/source/blender/draw/intern/draw_cache_impl_gpencil.c +++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c @@ -158,16 +158,6 @@ void DRW_gpencil_batch_cache_free(bGPdata *gpd) return; } -void DRW_gpencil_freecache(struct Object *ob) -{ - if ((ob) && (ob->type == OB_GPENCIL)) { - bGPdata *gpd = (bGPdata *)ob->data; - if (gpd) { - DRW_gpencil_batch_cache_free(gpd); - } - } -} - /** \} */ /* -------------------------------------------------------------------- */ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs