refactor: remove diff from instances
This commit is contained in:
@ -51,10 +51,6 @@ class BlCamera(BlDatablock):
|
|||||||
assert(self.buffer)
|
assert(self.buffer)
|
||||||
self.pointer = bpy.data.cameras.get(self.buffer['name'])
|
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):
|
def is_valid(self):
|
||||||
return bpy.data.cameras.get(self.buffer['name'])
|
return bpy.data.cameras.get(self.buffer['name'])
|
||||||
|
|
||||||
|
@ -43,11 +43,6 @@ class BlCollection(BlDatablock):
|
|||||||
def resolve(self):
|
def resolve(self):
|
||||||
assert(self.buffer)
|
assert(self.buffer)
|
||||||
self.pointer = bpy.data.collections.get(self.buffer['name'])
|
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):
|
def resolve_dependencies(self):
|
||||||
deps = []
|
deps = []
|
||||||
|
@ -50,10 +50,6 @@ class BlCurve(BlDatablock):
|
|||||||
assert(self.buffer)
|
assert(self.buffer)
|
||||||
self.pointer = bpy.data.curves.get(self.buffer['name'])
|
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):
|
def is_valid(self):
|
||||||
return bpy.data.curves.get(self.buffer['name'])
|
return bpy.data.curves.get(self.buffer['name'])
|
||||||
bl_id = "curves"
|
bl_id = "curves"
|
||||||
|
@ -58,9 +58,6 @@ class BlGpencil(BlDatablock):
|
|||||||
for mat in data['materials']:
|
for mat in data['materials']:
|
||||||
target.materials.append(bpy.data.materials[mat])
|
target.materials.append(bpy.data.materials[mat])
|
||||||
|
|
||||||
def diff(self):
|
|
||||||
return (self.bl_diff())
|
|
||||||
|
|
||||||
def dump(self, pointer=None):
|
def dump(self, pointer=None):
|
||||||
assert(pointer)
|
assert(pointer)
|
||||||
data = utils.dump_datablock(pointer, 2)
|
data = utils.dump_datablock(pointer, 2)
|
||||||
|
@ -131,11 +131,6 @@ class BlMaterial(BlDatablock):
|
|||||||
assert(self.buffer)
|
assert(self.buffer)
|
||||||
self.pointer = bpy.data.materials.get(self.buffer['name'])
|
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):
|
def resolve_dependencies(self):
|
||||||
# TODO: resolve node group deps
|
# TODO: resolve node group deps
|
||||||
deps = []
|
deps = []
|
||||||
|
@ -156,11 +156,6 @@ class BlMesh(BlDatablock):
|
|||||||
assert(self.buffer)
|
assert(self.buffer)
|
||||||
self.pointer = bpy.data.meshes.get(self.buffer['name'])
|
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):
|
def resolve_dependencies(self):
|
||||||
deps = []
|
deps = []
|
||||||
|
|
||||||
|
@ -103,11 +103,6 @@ class BlObject(BlDatablock):
|
|||||||
except:
|
except:
|
||||||
pass
|
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):
|
def resolve_dependencies(self):
|
||||||
deps = []
|
deps = []
|
||||||
|
|
||||||
|
@ -58,11 +58,6 @@ class BlScene(BlDatablock):
|
|||||||
scene_name = self.buffer['name']
|
scene_name = self.buffer['name']
|
||||||
|
|
||||||
self.pointer = bpy.data.scenes.get(scene_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):
|
def resolve_dependencies(self):
|
||||||
deps = []
|
deps = []
|
||||||
|
Submodule multi_user/libs/replication updated: bd411f7dbb...ef77f6c664
Reference in New Issue
Block a user