From 25c0666b901d8a083e79d606b5bd805ee18fee20 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 15 Jun 2017 12:38:55 +0200 Subject: Fix potentially dnagerous code in doversionning of brush. Even though in that specific it was probably safe-ish, there is no guarantee at this point Brush we want to remove are not used somewhere, better take the slightly slower, much safer `BKE_libblock_delete()` path here. --- source/blender/blenloader/intern/versioning_defaults.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/blenloader/intern/versioning_defaults.c') diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index e34f12b1cf9..e7e0054e7a1 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -242,13 +242,13 @@ void BLO_update_defaults_startup_blend(Main *bmain) /* remove polish brush (flatten/contrast does the same) */ br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Polish"); if (br) { - BKE_libblock_free(bmain, br); + BKE_libblock_delete(bmain, br); } /* remove brush brush (huh?) from some modes (draw brushes do the same) */ br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Brush"); if (br) { - BKE_libblock_free(bmain, br); + BKE_libblock_delete(bmain, br); } /* remove draw brush from texpaint (draw brushes do the same) */ -- cgit v1.2.3