From cae3750ff95ff2c68f666b949ada969613200359 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 14 Jan 2019 16:15:15 +0100 Subject: Cleanup: replace usages of deprecated BKE_libblock_free_ex by BKE_id_free_ex. --- source/blender/makesrna/intern/rna_main_api.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/makesrna') diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 0b521ceb686..3d8768bc7e1 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -137,7 +137,10 @@ static void rna_Main_ID_remove( RNA_POINTER_INVALIDATE(id_ptr); } else if (ID_REAL_USERS(id) <= 0) { - BKE_libblock_free_ex(bmain, id, do_id_user, do_ui_user); + const int flag = (do_id_user ? 0 : LIB_ID_FREE_NO_USER_REFCOUNT) | + (do_ui_user ? 0 : LIB_ID_FREE_NO_UI_USER); + /* Still using ID flags here, this is in-between commit anyway... */ + BKE_id_free_ex(bmain, id, flag, true); RNA_POINTER_INVALIDATE(id_ptr); } else { -- cgit v1.2.3