Commit: a980b2f455a70e85f15683435f2ef70f92bbd09b
Author: Campbell Barton
Date: Mon Jan 14 14:08:01 2019 +1100
Branches: master
https://developer.blender.org/rBa980b2f455a70e85f15683435f2ef70f92bbd09b
Fix message bus ID remapping
===================================================================
M source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
===================================================================
diff --git
a/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
b/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
index 6934f15a644..deaac18ba70 100644
--- a/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
+++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
@@ -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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
