refactor: remove usunused diff

multi_user/bl_types/bl_action.py

@@ -1,6 +1,5 @@
 import bpy
 import mathutils
-from jsondiff import diff
 
 from .. import utils
 from .bl_datablock import BlDatablock

multi_user/bl_types/bl_armature.py

@@ -1,6 +1,5 @@
 import bpy
 import mathutils
-from jsondiff import diff
 
 from ..libs.overrider import Overrider
 from .. import utils

multi_user/bl_types/bl_camera.py

@@ -1,5 +1,3 @@
-from jsondiff import diff
-
 import bpy
 import mathutils
 

multi_user/bl_types/bl_curve.py

@@ -1,6 +1,5 @@
 import bpy
 import mathutils
-from jsondiff import diff
 
 from .. import utils
 from .bl_datablock import BlDatablock

multi_user/bl_types/bl_gpencil.py

@@ -1,6 +1,5 @@
 import bpy
 import mathutils
-from jsondiff import diff
 
 from .. import utils
 from .bl_datablock import BlDatablock

multi_user/bl_types/bl_library.py

@@ -1,6 +1,5 @@
 import bpy
 import mathutils
-from jsondiff import diff
 
 from .. import utils
 from .bl_datablock import BlDatablock
@@ -22,8 +21,8 @@ class BlLibrary(BlDatablock):
         assert(self.data)
         self.pointer = bpy.data.libraries.get(self.data['name'])
 
-    def diff(self):
-        return (self.bl_diff())
+    # def diff(self):
+    #     return (self.bl_diff())
 
     def is_valid(self):
         return bpy.data.libraries.get(self.data['name'])

multi_user/bl_types/bl_light.py

@@ -1,6 +1,5 @@
 import bpy
 import mathutils
-from jsondiff import diff
 
 from .. import utils
 from .bl_datablock import BlDatablock

multi_user/bl_types/bl_material.py

@@ -1,7 +1,6 @@
 import bpy
 import mathutils
 import logging
-from jsondiff import diff
 
 from .. import utils
 from .bl_datablock import BlDatablock

multi_user/bl_types/bl_metaball.py

@@ -1,6 +1,5 @@
 import bpy
 import mathutils
-from jsondiff import diff
 
 from .. import utils
 from .bl_datablock import BlDatablock

multi_user/bl_types/bl_object.py

@@ -3,7 +3,6 @@ import mathutils
 
 from .. import utils
 from .bl_datablock import BlDatablock
-from jsondiff import diff
 
 
 class BlObject(BlDatablock):

multi_user/bl_types/bl_scene.py

@@ -1,6 +1,5 @@
 import bpy
 import mathutils
-from jsondiff import diff
 
 from .. import utils
 from .bl_datablock import BlDatablock

multi_user/bl_types/bl_user.py

@@ -1,6 +1,5 @@
 import bpy
 import mathutils
-import jsondiff
 
 from .. import utils
 from .. import presence

multi_user/bl_types/bl_world.py

@@ -1,6 +1,5 @@
 import bpy
 import mathutils
-from jsondiff import diff
 
 from .. import utils
 from .bl_datablock import BlDatablock

multi_user/delayable.py

@@ -74,7 +74,7 @@ class ApplyTimer(Timer):
                     try:
                         operators.client.apply(node)
                     except Exception:
-                        logger.error("fail to apply {}".format(node_ref.data['name']))
+                            logger.error("fail to apply {}".format(node_ref.uuid))
 
 
 class DynamicRightSelectTimer(Timer):

multi_user/ui.py

@@ -260,7 +260,7 @@ def draw_property(context, parent, property_uuid, level=0):
             area_msg.label(text="")
     line = area_msg.box()
 
-    name = item.data['name'] if item.data else item.pointer.name
+    name = item.data['name'] if item.data else item.uuid
 
     detail_item_box = line.row(align=True)