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

fix: wrong scene initialisation

Browse Source
This commit is contained in:
Swann 2020-05-16 21:45:42 +02:00
parent 95524fa3e9
commit 54bcd41267
No known key found for this signature in database
GPG Key ID: B880407E0F5F413E
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
multi_user/bl_types/bl_datablock.py
View File

@ -112,7 +112,7 @@ class BlDatablock(ReplicatedDatablock):
self.diff_method = DIFF_BINARY self.diff_method = DIFF_BINARY
def _resolve(self): def resolve(self):
datablock_ref = None datablock_ref = None
datablock_root = getattr(bpy.data, self.bl_id) datablock_root = getattr(bpy.data, self.bl_id)
datablock_ref = utils.find_from_attr('uuid', self.uuid, datablock_root) datablock_ref = utils.find_from_attr('uuid', self.uuid, datablock_root)
@ -123,8 +123,11 @@ class BlDatablock(ReplicatedDatablock):
if datablock_ref: if datablock_ref:
setattr(datablock_ref, 'uuid', self.uuid) setattr(datablock_ref, 'uuid', self.uuid)
else:
self._construct(data=self.data)
return datablock_ref
self.instance = datablock_ref
def _dump(self, instance=None): def _dump(self, instance=None):
dumper = Dumper() dumper = Dumper()

2
multi_user/libs/replication

@ -1 +1 @@
Subproject commit e0bbcf4ade5667ca505a458437719c0ee3c96150 Subproject commit 11ec4dcf652d8909a04e5e2b70fc7567207d78b5