[Bf-blender-cvs] [271210126e1] master: Fix T91834: Appending objects with shape keys into new file is broken.
Bastien Montagne
noreply at git.blender.org
Fri Oct 1 14:49:10 CEST 2021
Commit: 271210126e12713d70813937ddd4732993f7bb35
Author: Bastien Montagne
Date: Fri Oct 1 14:22:15 2021 +0200
Branches: master
https://developer.blender.org/rB271210126e12713d70813937ddd4732993f7bb35
Fix T91834: Appending objects with shape keys into new file is broken.
Recent append refactor 'broke' this, we need special recursive care and
handling of those nasty shpae keys... again.
===================================================================
M source/blender/windowmanager/intern/wm_files_link.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c
index ea0b0a9feaa..a73bea31669 100644
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@ -597,6 +597,11 @@ static int foreach_libblock_append_callback(LibraryIDLinkCallbackData *cb_data)
}
if (!BKE_idtype_idcode_is_linkable(GS(id->name))) {
+ /* While we do not want to add non-linkable ID (shape keys...) to the list of linked items,
+ * unfortunately they can use fully linkable valid IDs too, like actions. Those need to be
+ * processed, so we need to recursively deal with them here. */
+ BKE_library_foreach_ID_link(
+ cb_data->bmain, id, foreach_libblock_append_callback, data, IDWALK_NOP);
return IDWALK_RET_NOP;
}
More information about the Bf-blender-cvs
mailing list