refacor: clean resolve implementations

multi_user/bl_types/bl_collection.py

@@ -64,8 +64,6 @@ class BlCollection(BlDatablock):
         # return dumper.dump(pointer)
         return data
     def resolve(self):
-        assert(self.data)      
-        # self.pointer = bpy.data.collections.get(self.data['name'])
         self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.collections)
 
     def resolve_dependencies(self):

multi_user/bl_types/bl_light.py

@@ -40,7 +40,7 @@ class BlLight(BlDatablock):
         return data
 
     def resolve(self):
-        self.pointer = bpy.data.lights.get(self.data['name'])
+        self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.lights)
 
     def is_valid(self):
         return bpy.data.lights.get(self.data['name'])

multi_user/bl_types/bl_material.py

@@ -127,7 +127,7 @@ class BlMaterial(BlDatablock):
         return data
 
     def resolve(self):
-        self.pointer = bpy.data.materials.get(self.data['name'])
+        self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.materials)
 
     def resolve_dependencies(self):
         # TODO: resolve node group deps

multi_user/bl_types/bl_mesh.py

@@ -156,7 +156,6 @@ class BlMesh(BlDatablock):
 
     def resolve(self):
         self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.meshes) 
-        # self.pointer = bpy.data.meshes.get(self.data['name'])
 
     def resolve_dependencies(self):
         deps = []

multi_user/bl_types/bl_metaball.py

@@ -27,7 +27,7 @@ class BlMetaball(BlDatablock):
         return data
 
     def resolve(self):
-        self.pointer = bpy.data.metaballs.get(self.data['name'])
+        self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.metaballs)
 
     def is_valid(self):
         return bpy.data.metaballs.get(self.data['name'])

multi_user/bl_types/bl_object.py

@@ -97,11 +97,6 @@ class BlObject(BlDatablock):
 
     def resolve(self):
         self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.objects)
-        # object_name = self.data['name']
-        # try:
-        #     self.pointer = bpy.data.objects[object_name]
-        # except:
-        #     pass
 
     def resolve_dependencies(self):
         deps = []

multi_user/bl_types/bl_user.py

@@ -18,15 +18,10 @@ class BlUser(BlDatablock):
         utils.dump_anything.load(target, data)
     
     def apply(self):
-        # super().apply()
-        self.data = jsondiff.patch(self.data, self.modifications, marshal=True)
-        self.modifications = None
        
         if self.pointer:
             self.load(data=self.data, target=self.pointer)
 
-    #     settings = bpy.context.window_manager.session
-
         presence.refresh_3d_view()
         
         self.state = UP

multi_user/delayable.py

@@ -73,8 +73,8 @@ class ApplyTimer(Timer):
                 if node_ref.state == FETCHED:
                     try:
                         operators.client.apply(node)
-                    except Exception:
+                    except Exception as e:
-                            logger.error("fail to apply {}".format(node_ref.uuid))
+                            logger.error("fail to apply {}: {}".format(node_ref.uuid,e))
 
 
 class DynamicRightSelectTimer(Timer):
@@ -130,6 +130,7 @@ class DynamicRightSelectTimer(Timer):
                         elif not obj.hide_select and obj.uuid in user_ref.data['selected_objects']:
                             obj.hide_select = True
 
+
 class Draw(Delayable):
     def __init__(self):
         self._handler = None