From 101fd7ec0639c03ab017e90cb46367f50e512cbb Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 22 Jun 2018 12:26:45 +0200 Subject: Tweak new BKE_id_is_in_global_main to accept NULL pointer (and consider them as valid). --- source/blender/blenkernel/intern/library.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern') diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 444e155f5ac..00c542bcd4a 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -2418,6 +2418,7 @@ void BKE_id_tag_clear_atomic(ID *id, int tag) /** Check that given ID pointer actually is in G_MAIN. * Main intended use is for debug asserts in places we cannot easily get rid of G_Main... */ bool BKE_id_is_in_gobal_main(ID *id) { - return (BLI_findindex(which_libbase(G_MAIN, GS(id->name)), id) != -1); + /* We do not want to fail when id is NULL here, even though this is a bit strange behavior... */ + return (id == NULL || BLI_findindex(which_libbase(G_MAIN, GS(id->name)), id) != -1); } -- cgit v1.2.3