archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T86379: When using "Append" not handling properly RigidBody constraints

Browse Source 
This was simply never handled apparently.

Also fixes a regression from recent append refactor that prevented RB
objects to to properly handled too (since we instantiate loose objects
in append step now, we need to handle RigidBody ones after that
instantiation stage, otherwise nothing will happen since loose objects
won't be in any scene).
This commit is contained in:
Bastien Montagne
2021-10-05 10:45:28 +02:00
parent 7df6f66ea2
commit b6ad0735a6
2 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/windowmanager/intern/wm_files_link.c
View File

@@ -579,6 +579,16 @@ static void wm_append_loose_data_instantiate(WMLinkAppendData *lapp_data,
id->tag &= ~LIB_TAG_DOIT;
}
/* Finally, add rigid body objects and constraints to current RB world(s). */
for (itemlink = lapp_data->items.list; itemlink; itemlink = itemlink->next) {
WMLinkAppendDataItem *item = itemlink->link;
ID *id = wm_append_loose_data_instantiate_process_check(item);
if (id == NULL || GS(id->name) != ID_OB) {
continue;
}
BKE_rigidbody_ensure_local_object(bmain, (Object *)id);
}
}
/** \} */
@@ -773,9 +783,6 @@ static void wm_append_do(WMLinkAppendData *lapp_data,
local_appended_new_id);
}
if (GS(local_appended_new_id->name) == ID_OB) {
BKE_rigidbody_ensure_local_object(bmain, (Object *)local_appended_new_id);
}
if (set_fakeuser) {
if (!ELEM(GS(local_appended_new_id->name), ID_OB, ID_GR)) {
/* Do not set fake user on objects nor collections (instancing). */