diff options
author | Bastien Montagne <bastien@blender.org> | 2022-02-28 17:03:17 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2022-02-28 17:03:17 +0300 |
commit | f5159e078ef7a3089c3cdd9367eefe32465a2364 (patch) | |
tree | f89d4482193d84fb1d6bf115fb5e1c02f7b251e3 /source/blender | |
parent | db3f5ae48aca8fbc9922a94801c33b1120533cd6 (diff) | |
parent | 413e87b6b7edf8cc1569818de3d26fccc391d235 (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/blendfile_link_append.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/blendfile_link_append.c b/source/blender/blenkernel/intern/blendfile_link_append.c index f06274c34d7..862266b696c 100644 --- a/source/blender/blenkernel/intern/blendfile_link_append.c +++ b/source/blender/blenkernel/intern/blendfile_link_append.c @@ -927,8 +927,13 @@ static int foreach_libblock_link_append_callback(LibraryIDLinkCallbackData *cb_d * processed, so we need to recursively deal with them here. */ /* NOTE: Since we are by-passing checks in `BKE_library_foreach_ID_link` by manually calling it * recursively, we need to take care of potential recursion cases ourselves (e.g.animdata of - * shape-key referencing the shape-key itself). */ - if (id != cb_data->id_self) { + * shape-key referencing the shape-key itself). + * NOTE: in case both IDs (owner and 'used' ones) are non-linkable, we can assume we can break + * the dependency here. Indeed, either they are both linked in another way (through their own + * meshes for shape keys e.g.), or this is an unsupported case (two shapekeys depending on + * each-other need to be also 'linked' in by their respective meshes, independant shapekeys are + * not allowed). ref T96048. */ + if (id != cb_data->id_self && BKE_idtype_idcode_is_linkable(GS(cb_data->id_self->name))) { BKE_library_foreach_ID_link( cb_data->bmain, id, foreach_libblock_link_append_callback, data, IDWALK_NOP); } |