From c23b5923ab9c7d306ebc667453ad85187dc5d0db Mon Sep 17 00:00:00 2001 From: Swann Date: Tue, 7 Apr 2020 09:59:04 +0200 Subject: [PATCH] refactor: cleanup --- multi_user/bl_types/bl_collection.py | 6 ++---- multi_user/bl_types/bl_lattice.py | 6 +++--- multi_user/bl_types/bl_scene.py | 1 - 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/multi_user/bl_types/bl_collection.py b/multi_user/bl_types/bl_collection.py index 4a4d382..1bf3e17 100644 --- a/multi_user/bl_types/bl_collection.py +++ b/multi_user/bl_types/bl_collection.py @@ -38,12 +38,10 @@ class BlCollection(BlDatablock): name for name in sourceData.collections if name == self.data['name']] instance = bpy.data.collections[self.data['name']] - instance.uuid = self.uuid return instance instance = bpy.data.collections.new(data["name"]) - instance.uuid = self.uuid return instance def _load_implementation(self, data, target): @@ -80,7 +78,7 @@ class BlCollection(BlDatablock): collection_objects = [] for object in pointer.objects: if object not in collection_objects: - collection_objects.append(object.uuid) + collection_objects.append(object.name) data['objects'] = collection_objects @@ -88,7 +86,7 @@ class BlCollection(BlDatablock): collection_children = [] for child in pointer.children: if child not in collection_children: - collection_children.append(child.uuid) + collection_children.append(child.name) data['children'] = collection_children diff --git a/multi_user/bl_types/bl_lattice.py b/multi_user/bl_types/bl_lattice.py index d816a2c..238a2a9 100644 --- a/multi_user/bl_types/bl_lattice.py +++ b/multi_user/bl_types/bl_lattice.py @@ -33,15 +33,15 @@ class BlLattice(BlDatablock): bl_automatic_push = True bl_icon = 'LATTICE_DATA' + def _construct(self, data): + return bpy.data.lattices.new(data["name"]) + def _load_implementation(self, data, target): loader = Loader() loader.load(target, data) np_load_collection(data['points'], target.points, POINT) - def _construct(self, data): - return bpy.data.lattices.new(data["name"]) - def _dump_implementation(self, data, pointer=None): assert(pointer) diff --git a/multi_user/bl_types/bl_scene.py b/multi_user/bl_types/bl_scene.py index 08aeffe..3e4b91e 100644 --- a/multi_user/bl_types/bl_scene.py +++ b/multi_user/bl_types/bl_scene.py @@ -34,7 +34,6 @@ class BlScene(BlDatablock): def _construct(self, data): instance = bpy.data.scenes.new(data["name"]) - instance.uuid = self.uuid return instance def _load_implementation(self, data, target):