From fef088e39bc923d0af1947ac68994dedbd1e9635 Mon Sep 17 00:00:00 2001 From: Swann Date: Wed, 1 Apr 2020 10:23:28 +0200 Subject: [PATCH] refactor: cleanup lattice --- multi_user/bl_types/bl_lattice.py | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/multi_user/bl_types/bl_lattice.py b/multi_user/bl_types/bl_lattice.py index a19c4ce..1c5443f 100644 --- a/multi_user/bl_types/bl_lattice.py +++ b/multi_user/bl_types/bl_lattice.py @@ -19,9 +19,11 @@ import bpy import mathutils -from .. import utils +from ..libs.dump_anything import Dumper, Loader, np_dump_collection, np_load_collection from .bl_datablock import BlDatablock +POINT = ['co', 'weight_softbody', 'co_deform'] + class BlLattice(BlDatablock): bl_id = "lattices" @@ -32,18 +34,19 @@ class BlLattice(BlDatablock): bl_icon = 'LATTICE_DATA' def _load_implementation(self, data, target): - utils.dump_anything.load(target, data) + loader = Loader() + loader.load(target, data) + + np_load_collection(data['points'], target.points, POINT) - for point in data['points']: - utils.dump_anything.load(target.points[point], data["points"][point]) def _construct(self, data): return bpy.data.lattices.new(data["name"]) def _dump_implementation(self, data, pointer=None): assert(pointer) - dumper = utils.dump_anything.Dumper() - dumper.depth = 3 + dumper = Dumper() + dumper.depth = 1 dumper.include_filter = [ "name", 'type', @@ -53,17 +56,10 @@ class BlLattice(BlDatablock): 'interpolation_type_u', 'interpolation_type_v', 'interpolation_type_w', - 'use_outside', - 'points', - 'co', - 'weight_softbody', - 'co_deform' + 'use_outside' ] data = dumper.dump(pointer) + data['points'] = np_dump_collection(pointer.points, POINT) return data - - - -