From 4a127e617cecb180aacc9d5271fb9a1e0d30fa88 Mon Sep 17 00:00:00 2001 From: Swann Martinez <s.martinez@cubedns.fr> Date: Fri, 13 Mar 2020 15:05:00 +0100 Subject: [PATCH] feat: cleanup --- multi_user/bl_types/bl_datablock.py | 16 ---------------- multi_user/libs/replication | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/multi_user/bl_types/bl_datablock.py b/multi_user/bl_types/bl_datablock.py index be6c8ed..f370bc6 100644 --- a/multi_user/bl_types/bl_datablock.py +++ b/multi_user/bl_types/bl_datablock.py @@ -77,22 +77,6 @@ class BlDatablock(ReplicatedDatablock): self.diff_method = DIFF_BINARY - def library_apply(self): - """Apply stored data - """ - # UP in case we want to reset our pointer data - self.state = UP - - def bl_diff(self): - """Generic datablock diff""" - return self.pointer.name != self.data['name'] - - def diff_library(self): - return False - - def resolve_deps_library(self): - return [self.pointer.library] - def resolve(self): datablock_ref = None datablock_root = getattr(bpy.data, self.bl_id) diff --git a/multi_user/libs/replication b/multi_user/libs/replication index 99bf948..f24d796 160000 --- a/multi_user/libs/replication +++ b/multi_user/libs/replication @@ -1 +1 @@ -Subproject commit 99bf94874a07890dc747ec53519aa34443a95146 +Subproject commit f24d796fe30c601d1ecee6231dd845ceab4707e1