diff options
author | Julian Eisel <julian@blender.org> | 2022-05-27 20:15:58 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2022-05-27 20:15:58 +0300 |
commit | 7b65086fdf9cd4e70a6acceff1947e7bd3aa5613 (patch) | |
tree | 2f4b68e758c2a2680f48c6b5e79f879ef4b62167 /source/blender/blenkernel | |
parent | da1dd98101a3301817f7776941246d4fa680731c (diff) |
Cleanup: Use new macro for deprecated ID types
Uses the macro introduced in b45f410b315 where it makes sense.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/lib_id.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c index 2f8b3e00df9..528681d196e 100644 --- a/source/blender/blenkernel/intern/lib_id.c +++ b/source/blender/blenkernel/intern/lib_id.c @@ -311,7 +311,7 @@ void id_us_min(ID *id) const int limit = ID_FAKE_USERS(id); if (id->us <= limit) { - if (GS(id->name) != ID_IP) { + if (!ID_TYPE_IS_DEPRECATED(GS(id->name))) { /* Do not assert on deprecated ID types, we cannot really ensure that their ID refcounting * is valid... */ CLOG_ERROR(&LOG, @@ -590,11 +590,9 @@ static int id_copy_libmanagement_cb(LibraryIDLinkCallbackData *cb_data) bool BKE_id_copy_is_allowed(const ID *id) { -#define LIB_ID_TYPES_NOCOPY \ - ID_LI, ID_SCR, ID_WM, ID_WS, /* Not supported */ \ - ID_IP /* Deprecated */ +#define LIB_ID_TYPES_NOCOPY ID_LI, ID_SCR, ID_WM, ID_WS /* Not supported */ - return !ELEM(GS(id->name), LIB_ID_TYPES_NOCOPY); + return !ID_TYPE_IS_DEPRECATED(GS(id->name)) && !ELEM(GS(id->name), LIB_ID_TYPES_NOCOPY); #undef LIB_ID_TYPES_NOCOPY } |