diff --git a/multi_user/bl_types/bl_datablock.py b/multi_user/bl_types/bl_datablock.py index 2fdd203..f54cbb4 100644 --- a/multi_user/bl_types/bl_datablock.py +++ b/multi_user/bl_types/bl_datablock.py @@ -4,7 +4,7 @@ import mathutils from .. import utils from ..libs.replication.replication.data import ReplicatedDatablock from ..libs.replication.replication.constants import UP - +from ..libs.replication.replication.constants import DIFF_BINARY def dump_driver(driver): dumper = utils.dump_anything.Dumper() @@ -80,6 +80,8 @@ class BlDatablock(ReplicatedDatablock): if self.pointer and hasattr(self.pointer, 'uuid'): self.pointer.uuid = self.uuid + + self.diff_method = DIFF_BINARY def library_apply(self): """Apply stored data diff --git a/multi_user/bl_types/bl_mesh.py b/multi_user/bl_types/bl_mesh.py index c275208..e6ca629 100644 --- a/multi_user/bl_types/bl_mesh.py +++ b/multi_user/bl_types/bl_mesh.py @@ -3,6 +3,7 @@ import bmesh import mathutils from .. import utils + from .bl_datablock import BlDatablock def dump_mesh(mesh, data={}): @@ -81,9 +82,10 @@ class BlMesh(BlDatablock): bl_delay_refresh = 10 bl_delay_apply = 10 bl_automatic_push = True - bl_icon = 'MESH_DATA' + bl_icon = 'MESH_DATA' def construct(self, data): + instance = bpy.data.meshes.new(data["name"]) instance.uuid = self.uuid return instance diff --git a/multi_user/libs/replication b/multi_user/libs/replication index 8744db4..39a52ac 160000 --- a/multi_user/libs/replication +++ b/multi_user/libs/replication @@ -1 +1 @@ -Subproject commit 8744db43ddb84f1cfd192ab2340e5af7e9c08ae7 +Subproject commit 39a52ac28cfd3e62336c560cf59305112a96b813 diff --git a/multi_user/operators.py b/multi_user/operators.py index 9ed2260..48d5a8e 100644 --- a/multi_user/operators.py +++ b/multi_user/operators.py @@ -511,8 +511,8 @@ def depsgraph_evaluation(scene): if 'EDIT' in context.mode: break logger.error("UPDATE: MODIFIFY {}".format(type(update.id))) - client.commit(node.uuid) - client.push(node.uuid) + # client.commit(node.uuid) + # client.push(node.uuid) else: # Distant update continue