[Bf-blender-cvs] [9a2b2066393] master: Minor cleanup: Use `ID_IS_LINKED`.
Bastien Montagne
noreply at git.blender.org
Thu Feb 10 17:30:12 CET 2022
Commit: 9a2b206639364fcc696b44879a715eaacc60347a
Author: Bastien Montagne
Date: Thu Feb 10 17:29:31 2022 +0100
Branches: master
https://developer.blender.org/rB9a2b206639364fcc696b44879a715eaacc60347a
Minor cleanup: Use `ID_IS_LINKED`.
===================================================================
M source/blender/blenkernel/intern/lib_override.c
===================================================================
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c
index 049b5e75c89..59cb6b2036e 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -1955,7 +1955,8 @@ static int lib_override_sort_libraries_func(LibraryIDLinkCallbackData *cb_data)
ID *id_owner = cb_data->id_owner;
ID *id = *cb_data->id_pointer;
if (id != NULL && ID_IS_LINKED(id) && id->lib != id_owner->lib) {
- const int owner_library_indirect_level = id_owner->lib != NULL ? id_owner->lib->temp_index : 0;
+ const int owner_library_indirect_level = ID_IS_LINKED(id_owner) ? id_owner->lib->temp_index :
+ 0;
if (owner_library_indirect_level > 10000) {
CLOG_ERROR(
&LOG,
More information about the Bf-blender-cvs
mailing list