Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: dual identification for object parents

Browse Source
This commit is contained in:
Swann
2021-04-13 14:37:43 +02:00
parent 5e30e215ab
commit cb85a1db4c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
multi_user/bl_types/bl_object.py
View File

@ -317,9 +317,9 @@ class BlObject(BlDatablock):
loader.load(target.display, data['display']) loader.load(target.display, data['display'])
# Parenting # Parenting
parent_id = data.get('parent_id') parent_id = data.get('parent_uid')
if parent_id: 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 # Avoid reloading
if target.parent != parent and parent is not None: if target.parent != parent and parent is not None:
target.parent = parent target.parent = parent
@ -450,7 +450,7 @@ class BlObject(BlDatablock):
# PARENTING # PARENTING
if instance.parent: if instance.parent:
data['parent_id'] = instance.parent.name data['parent_uid'] = (instance.parent.uuid, instance.parent.name)
# MODIFIERS # MODIFIERS
if hasattr(instance, 'modifiers'): if hasattr(instance, 'modifiers'):