diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-01-14 18:15:15 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-01-15 13:09:16 +0300 |
| commit | cae3750ff95ff2c68f666b949ada969613200359 (patch) | |
| tree | eab3454882ffa3c8ce331de8533c176aaa822513 /source/blender/makesrna | |
| parent | 6af97b84dfa286fc5c8efb2b0536ed1b87f591b0 (diff) | |
Cleanup: replace usages of deprecated BKE_libblock_free_ex by BKE_id_free_ex.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_main_api.c | 5 |
1 files changed, 4 insertions, 1 deletions
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 { |