diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-22 13:26:45 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-22 13:26:45 +0300 |
| commit | 101fd7ec0639c03ab017e90cb46367f50e512cbb (patch) | |
| tree | 3f435010ee2e363aa8db9148a36117b7bccd96d2 | |
| parent | cbf5c738d6edaa3e5feecab6a97327cbfd96e06e (diff) | |
Tweak new BKE_id_is_in_global_main to accept NULL pointer (and consider them as valid).
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |