From 54bcd4126759af140b42808e35985563b6fb9533 Mon Sep 17 00:00:00 2001 From: Swann Date: Sat, 16 May 2020 21:45:42 +0200 Subject: [PATCH] fix: wrong scene initialisation --- multi_user/bl_types/bl_datablock.py | 7 +++++-- multi_user/libs/replication | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/multi_user/bl_types/bl_datablock.py b/multi_user/bl_types/bl_datablock.py index 84ad307..5abc84e 100644 --- a/multi_user/bl_types/bl_datablock.py +++ b/multi_user/bl_types/bl_datablock.py @@ -112,7 +112,7 @@ class BlDatablock(ReplicatedDatablock): self.diff_method = DIFF_BINARY - def _resolve(self): + def resolve(self): datablock_ref = None datablock_root = getattr(bpy.data, self.bl_id) datablock_ref = utils.find_from_attr('uuid', self.uuid, datablock_root) @@ -123,8 +123,11 @@ class BlDatablock(ReplicatedDatablock): if datablock_ref: setattr(datablock_ref, 'uuid', self.uuid) + else: + self._construct(data=self.data) - return datablock_ref + + self.instance = datablock_ref def _dump(self, instance=None): dumper = Dumper() diff --git a/multi_user/libs/replication b/multi_user/libs/replication index e0bbcf4..11ec4dc 160000 --- a/multi_user/libs/replication +++ b/multi_user/libs/replication @@ -1 +1 @@ -Subproject commit e0bbcf4ade5667ca505a458437719c0ee3c96150 +Subproject commit 11ec4dcf652d8909a04e5e2b70fc7567207d78b5