From 292f76aea59145e4d6e6d275c0ad4d671acb1040 Mon Sep 17 00:00:00 2001 From: Swann Martinez Date: Fri, 28 Feb 2020 15:39:29 +0100 Subject: [PATCH] feat: move diff to observer feat: logs --- multi_user/bl_types/bl_datablock.py | 2 +- multi_user/libs/replication | 2 +- multi_user/operators.py | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/multi_user/bl_types/bl_datablock.py b/multi_user/bl_types/bl_datablock.py index f54cbb4..f1780c2 100644 --- a/multi_user/bl_types/bl_datablock.py +++ b/multi_user/bl_types/bl_datablock.py @@ -81,7 +81,7 @@ class BlDatablock(ReplicatedDatablock): if self.pointer and hasattr(self.pointer, 'uuid'): self.pointer.uuid = self.uuid - self.diff_method = DIFF_BINARY + # self.diff_method = DIFF_BINARY def library_apply(self): """Apply stored data diff --git a/multi_user/libs/replication b/multi_user/libs/replication index ed2f080..1aab152 160000 --- a/multi_user/libs/replication +++ b/multi_user/libs/replication @@ -1 +1 @@ -Subproject commit ed2f080bce952db6756016798d606b915bdf67a8 +Subproject commit 1aab152fa36e11a6f99ff03e5d2bb6b1f9d344d5 diff --git a/multi_user/operators.py b/multi_user/operators.py index 0b8bcc0..d7f66e4 100644 --- a/multi_user/operators.py +++ b/multi_user/operators.py @@ -497,15 +497,11 @@ def depsgraph_evaluation(scene): # - if its ours or ( under common and diff), launch the # update process # - if its to someone else, ignore the update (go deeper ?) - if node.owner in [session_infos.username]: + if node.owner in [session_infos.username, 'COMMON']: # Avoid slow geometry update if 'EDIT' in context.mode: break client.stash(node.uuid) - # TODO: Do this from replication api...Maybe as a task ! - if node.owner == 'COMMON': - if node.diff(): - client.stash(node.uuid) else: # Distant update continue