diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-08-12 13:40:46 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-08-12 13:40:46 +0300 |
| commit | 74645d969b57b3cf6ca14ec7a218345aea311f16 (patch) | |
| tree | 7868f499c56176c5d7bd57416ec29caf65e0de4d /source/blender/blenkernel/intern/lib_query.c | |
| parent | 7f733e294d5485178df800685c69cc15547ee73c (diff) | |
| parent | afd2e9ebc38a6182746707c6c6ba65ad7414d377 (diff) | |
Merge branch 'blender-v3.3-release'
Conflicts:
source/blender/blenkernel/BKE_lib_override.h
Diffstat (limited to 'source/blender/blenkernel/intern/lib_query.c')
| -rw-r--r-- | source/blender/blenkernel/intern/lib_query.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c index 7cc07d59187..38d1a30592d 100644 --- a/source/blender/blenkernel/intern/lib_query.c +++ b/source/blender/blenkernel/intern/lib_query.c @@ -713,7 +713,7 @@ static void lib_query_unused_ids_tag_recurse(Main *bmain, /* Directly 'by-pass' to actual real ID owner. */ const IDTypeInfo *type_info_from = BKE_idtype_get_info_from_id(id_from); BLI_assert(type_info_from->owner_get != NULL); - id_from = type_info_from->owner_get(bmain, id_from); + id_from = type_info_from->owner_get(bmain, id_from, NULL); } lib_query_unused_ids_tag_recurse( |