From 4d69faf186814768e92710b58cd2adbede949659 Mon Sep 17 00:00:00 2001 From: Swann Date: Fri, 22 Jan 2021 14:24:19 +0100 Subject: [PATCH] clan: remove diff_method --- multi_user/__init__.py | 2 +- multi_user/bl_types/bl_datablock.py | 5 ----- multi_user/bl_types/bl_file.py | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/multi_user/__init__.py b/multi_user/__init__.py index 2cfe4a1..afc505c 100644 --- a/multi_user/__init__.py +++ b/multi_user/__init__.py @@ -44,7 +44,7 @@ from . import environment DEPENDENCIES = { - ("replication", '0.1.23'), + ("replication", '0.1.24'), } diff --git a/multi_user/bl_types/bl_datablock.py b/multi_user/bl_types/bl_datablock.py index b33fe5d..40b9944 100644 --- a/multi_user/bl_types/bl_datablock.py +++ b/multi_user/bl_types/bl_datablock.py @@ -129,11 +129,6 @@ class BlDatablock(ReplicatedDatablock): if instance and hasattr(instance, 'uuid'): instance.uuid = self.uuid - if logging.getLogger().level == logging.DEBUG: - self.diff_method = DIFF_JSON - else: - self.diff_method = DIFF_BINARY - def resolve(self, construct = True): datablock_ref = None datablock_root = getattr(bpy.data, self.bl_id) diff --git a/multi_user/bl_types/bl_file.py b/multi_user/bl_types/bl_file.py index c4e7946..f39106e 100644 --- a/multi_user/bl_types/bl_file.py +++ b/multi_user/bl_types/bl_file.py @@ -69,7 +69,6 @@ class BlFile(ReplicatedDatablock): raise FileNotFoundError(str(self.instance)) self.preferences = utils.get_preferences() - self.diff_method = DIFF_BINARY def resolve(self, construct = True): if self.data: