fix: material error

multi_user/bl_types/bl_gpencil.py

@@ -228,6 +228,9 @@ class BlGpencil(BlDatablock):
             for mat in data['materials']:
                 target.materials.append(bpy.data.materials[mat])
 
+        loader = Loader()
+        loader.load(target, data)
+        
         # TODO: reuse existing layer
         for layer in target.layers:
             target.layers.remove(layer)
@@ -244,8 +247,7 @@ class BlGpencil(BlDatablock):
 
                 load_layer(layer_data, target_layer)
         
-        loader = Loader()
-        loader.load(target, data)
+        
 
 
 
@@ -253,6 +255,14 @@ class BlGpencil(BlDatablock):
         assert(pointer)
         dumper = Dumper()
         dumper.depth = 2
+        dumper.include_filter = [
+            'materials',
+            'name',
+            'zdepth_offset',
+            'stroke_thickness_space',
+            'pixel_factor',
+            'stroke_depth_order'
+        ]
         data = dumper.dump(pointer)
 
         data['layers'] = {}

multi_user/bl_types/bl_library.py

@@ -41,6 +41,6 @@ class BlLibrary(BlDatablock):
     def dump(self, pointer=None):
         assert(pointer)
         dumper = Dumper()
-        return dumper.dump(pointer, 1)
+        return dumper.dump(pointer)
 
 

multi_user/bl_types/bl_material.py

@@ -178,7 +178,7 @@ class BlMaterial(BlDatablock):
                 target.grease_pencil, data['grease_pencil'])
 
 
-        elif data["use_nodes"]:
+        if data["use_nodes"]:
             if target.node_tree is None:
                 target.use_nodes = True
 
@@ -224,7 +224,8 @@ class BlMaterial(BlDatablock):
             data["node_tree"]['nodes'] = nodes
             
             data["node_tree"]["links"] = dump_links(pointer.node_tree.links)
-        elif pointer.is_grease_pencil:
+        
+        if pointer.is_grease_pencil:
             gp_mat_dumper = Dumper()
             gp_mat_dumper.depth = 3