diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-01-27 16:37:24 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-01-27 16:37:24 +0300 |
| commit | 6016dbb1a75566e1fb3ca257a1f13b9bba4467fd (patch) | |
| tree | 30ca1741378f36e7c6af17beb1b12c46fb487d05 /source/blender/blenkernel/intern/lib_query.c | |
| parent | c453aaa0b2408b50af7d47722114f1903f27a6fc (diff) | |
| parent | 0379ddac7d68114798c8963821fd821c1b3d7d28 (diff) | |
Merge branch 'master' into temp-gpu-image-engine
# Conflicts:
# source/blender/blenkernel/CMakeLists.txt
# source/blender/draw/CMakeLists.txt
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 4ad0186f9b5..1f20a84098c 100644 --- a/source/blender/blenkernel/intern/lib_query.c +++ b/source/blender/blenkernel/intern/lib_query.c @@ -439,7 +439,7 @@ bool BKE_library_id_can_use_idtype(ID *id_owner, const short id_type_used) case ID_LA: return (ELEM(id_type_used, ID_TE)); case ID_CA: - return ELEM(id_type_used, ID_OB); + return ELEM(id_type_used, ID_OB, ID_IM); case ID_KE: /* Warning! key->from, could be more types in future? */ return ELEM(id_type_used, ID_ME, ID_CU, ID_LT); |