diff --git a/multi_user/bl_types/bl_object.py b/multi_user/bl_types/bl_object.py index 9a1df18..a5e3bb6 100644 --- a/multi_user/bl_types/bl_object.py +++ b/multi_user/bl_types/bl_object.py @@ -317,9 +317,9 @@ class BlObject(BlDatablock): loader.load(target.display, data['display']) # Parenting - parent_id = data.get('parent_id') + parent_id = data.get('parent_uid') if parent_id: - parent = bpy.data.objects[parent_id] + parent = get_datablock_from_uuid(parent_id[0], bpy.data.objects[parent_id[1]]) # Avoid reloading if target.parent != parent and parent is not None: target.parent = parent @@ -450,7 +450,7 @@ class BlObject(BlDatablock): # PARENTING if instance.parent: - data['parent_id'] = instance.parent.name + data['parent_uid'] = (instance.parent.uuid, instance.parent.name) # MODIFIERS if hasattr(instance, 'modifiers'):