griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix message bus ID remapping

Browse Source
This commit is contained in:
Campbell Barton
2019-01-14 14:08:01 +11:00
parent 723e469686
commit a980b2f455
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
View File

@@ -145,12 +145,14 @@ static void wm_msg_rna_update_by_id(
remove = false;
}
else {
/* we need to resolve this from the */
/* We need to resolve this from the new ID pointer. */
PointerRNA idptr;
RNA_id_pointer_create(id_dst, &idptr);
PointerRNA ptr;
PropertyRNA *prop;
if (!RNA_path_resolve(&idptr, key->msg.params.data_path, &ptr, &prop)) {
PropertyRNA *prop = NULL;
if (RNA_path_resolve(&idptr, key->msg.params.data_path, &ptr, &prop) &&
(prop == NULL) == (key->msg.params.prop == NULL))
{
key->msg.params.ptr = ptr;
key->msg.params.prop = prop;
remove = false;