diff --git a/multi_user/bl_types/bl_camera.py b/multi_user/bl_types/bl_camera.py index b36baeb..d90b56d 100644 --- a/multi_user/bl_types/bl_camera.py +++ b/multi_user/bl_types/bl_camera.py @@ -51,10 +51,6 @@ class BlCamera(BlDatablock): assert(self.buffer) self.pointer = bpy.data.cameras.get(self.buffer['name']) - def diff(self): - return (self.bl_diff() or - len(diff(self.dump(pointer=self.pointer), self.buffer))) - def is_valid(self): return bpy.data.cameras.get(self.buffer['name']) diff --git a/multi_user/bl_types/bl_collection.py b/multi_user/bl_types/bl_collection.py index c946c2a..91659ec 100644 --- a/multi_user/bl_types/bl_collection.py +++ b/multi_user/bl_types/bl_collection.py @@ -43,11 +43,6 @@ class BlCollection(BlDatablock): def resolve(self): assert(self.buffer) self.pointer = bpy.data.collections.get(self.buffer['name']) - - def diff(self): - return (self.bl_diff() or - len(self.pointer.objects) != len(self.buffer['objects']) or - len(self.pointer.children) != len(self.buffer['children'])) def resolve_dependencies(self): deps = [] diff --git a/multi_user/bl_types/bl_curve.py b/multi_user/bl_types/bl_curve.py index c64f48c..37695bf 100644 --- a/multi_user/bl_types/bl_curve.py +++ b/multi_user/bl_types/bl_curve.py @@ -50,10 +50,6 @@ class BlCurve(BlDatablock): assert(self.buffer) self.pointer = bpy.data.curves.get(self.buffer['name']) - def diff(self): - return (self.bl_diff() or - len(diff(self.dump(pointer=self.pointer), self.buffer)) > 1) - def is_valid(self): return bpy.data.curves.get(self.buffer['name']) bl_id = "curves" diff --git a/multi_user/bl_types/bl_gpencil.py b/multi_user/bl_types/bl_gpencil.py index 61fb82c..0b74207 100644 --- a/multi_user/bl_types/bl_gpencil.py +++ b/multi_user/bl_types/bl_gpencil.py @@ -58,9 +58,6 @@ class BlGpencil(BlDatablock): for mat in data['materials']: target.materials.append(bpy.data.materials[mat]) - def diff(self): - return (self.bl_diff()) - def dump(self, pointer=None): assert(pointer) data = utils.dump_datablock(pointer, 2) diff --git a/multi_user/bl_types/bl_material.py b/multi_user/bl_types/bl_material.py index b3098cd..58a03b9 100644 --- a/multi_user/bl_types/bl_material.py +++ b/multi_user/bl_types/bl_material.py @@ -131,11 +131,6 @@ class BlMaterial(BlDatablock): assert(self.buffer) self.pointer = bpy.data.materials.get(self.buffer['name']) - def diff(self): - diff_rev = diff(self.dump(pointer=self.pointer), self.buffer) - return (self.bl_diff() or - len(diff_rev.keys()) > 0) - def resolve_dependencies(self): # TODO: resolve node group deps deps = [] diff --git a/multi_user/bl_types/bl_mesh.py b/multi_user/bl_types/bl_mesh.py index 765a0a1..1a7cda5 100644 --- a/multi_user/bl_types/bl_mesh.py +++ b/multi_user/bl_types/bl_mesh.py @@ -156,11 +156,6 @@ class BlMesh(BlDatablock): assert(self.buffer) self.pointer = bpy.data.meshes.get(self.buffer['name']) - def diff(self): - return (self.bl_diff() or - len(self.pointer.vertices) != len(self.buffer['verts']) or - len(self.pointer.materials) != len(self.buffer['materials'])) - def resolve_dependencies(self): deps = [] diff --git a/multi_user/bl_types/bl_object.py b/multi_user/bl_types/bl_object.py index 7e91c47..fb08bb9 100644 --- a/multi_user/bl_types/bl_object.py +++ b/multi_user/bl_types/bl_object.py @@ -103,11 +103,6 @@ class BlObject(BlDatablock): except: pass - def diff(self): - diff_rev = diff(self.dump(pointer=self.pointer), self.buffer) - return (self.bl_diff() or - len(diff_rev.keys())>0) - def resolve_dependencies(self): deps = [] diff --git a/multi_user/bl_types/bl_scene.py b/multi_user/bl_types/bl_scene.py index 19ffa81..83d50f1 100644 --- a/multi_user/bl_types/bl_scene.py +++ b/multi_user/bl_types/bl_scene.py @@ -58,11 +58,6 @@ class BlScene(BlDatablock): scene_name = self.buffer['name'] self.pointer = bpy.data.scenes.get(scene_name) - - def diff(self): - return (self.bl_diff() or - len(self.pointer.collection.objects) != len(self.buffer['collection']['objects']) or - len(self.pointer.collection.children) != len(self.buffer['collection']['children'])) def resolve_dependencies(self): deps = [] diff --git a/multi_user/libs/replication b/multi_user/libs/replication index bd411f7..ef77f6c 160000 --- a/multi_user/libs/replication +++ b/multi_user/libs/replication @@ -1 +1 @@ -Subproject commit bd411f7dbb4079efb346b791df5ed7fd465349e7 +Subproject commit ef77f6c664bcfb0cb6fddc8e9c89020b88795176