From 2f002be7a8365e2538c42fcda2e2b9c6870bb6b7 Mon Sep 17 00:00:00 2001 From: Swann Martinez Date: Wed, 9 Oct 2019 14:09:11 +0200 Subject: [PATCH] refactor: remove usunused diff --- multi_user/bl_types/bl_action.py | 1 - multi_user/bl_types/bl_armature.py | 1 - multi_user/bl_types/bl_camera.py | 2 -- multi_user/bl_types/bl_curve.py | 1 - multi_user/bl_types/bl_gpencil.py | 1 - multi_user/bl_types/bl_library.py | 5 ++--- multi_user/bl_types/bl_light.py | 1 - multi_user/bl_types/bl_material.py | 1 - multi_user/bl_types/bl_metaball.py | 1 - multi_user/bl_types/bl_object.py | 1 - multi_user/bl_types/bl_scene.py | 1 - multi_user/bl_types/bl_user.py | 1 - multi_user/bl_types/bl_world.py | 1 - multi_user/delayable.py | 2 +- multi_user/libs/replication | 2 +- multi_user/ui.py | 2 +- 16 files changed, 5 insertions(+), 19 deletions(-) diff --git a/multi_user/bl_types/bl_action.py b/multi_user/bl_types/bl_action.py index c7ed06e..1e65a27 100644 --- a/multi_user/bl_types/bl_action.py +++ b/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 diff --git a/multi_user/bl_types/bl_armature.py b/multi_user/bl_types/bl_armature.py index 7d1f4bc..dccfc9d 100644 --- a/multi_user/bl_types/bl_armature.py +++ b/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 diff --git a/multi_user/bl_types/bl_camera.py b/multi_user/bl_types/bl_camera.py index 2d8f0f0..4941810 100644 --- a/multi_user/bl_types/bl_camera.py +++ b/multi_user/bl_types/bl_camera.py @@ -1,5 +1,3 @@ -from jsondiff import diff - import bpy import mathutils diff --git a/multi_user/bl_types/bl_curve.py b/multi_user/bl_types/bl_curve.py index e089f78..c45e61f 100644 --- a/multi_user/bl_types/bl_curve.py +++ b/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 diff --git a/multi_user/bl_types/bl_gpencil.py b/multi_user/bl_types/bl_gpencil.py index a263eaf..74e4ca6 100644 --- a/multi_user/bl_types/bl_gpencil.py +++ b/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 diff --git a/multi_user/bl_types/bl_library.py b/multi_user/bl_types/bl_library.py index 5964092..1302563 100644 --- a/multi_user/bl_types/bl_library.py +++ b/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']) diff --git a/multi_user/bl_types/bl_light.py b/multi_user/bl_types/bl_light.py index a6897ab..909ba69 100644 --- a/multi_user/bl_types/bl_light.py +++ b/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 diff --git a/multi_user/bl_types/bl_material.py b/multi_user/bl_types/bl_material.py index b1bb6a6..4a797fc 100644 --- a/multi_user/bl_types/bl_material.py +++ b/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 diff --git a/multi_user/bl_types/bl_metaball.py b/multi_user/bl_types/bl_metaball.py index e6331e0..f01b193 100644 --- a/multi_user/bl_types/bl_metaball.py +++ b/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 diff --git a/multi_user/bl_types/bl_object.py b/multi_user/bl_types/bl_object.py index ca98c74..094a254 100644 --- a/multi_user/bl_types/bl_object.py +++ b/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): diff --git a/multi_user/bl_types/bl_scene.py b/multi_user/bl_types/bl_scene.py index 9974a4b..1c73fb7 100644 --- a/multi_user/bl_types/bl_scene.py +++ b/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 diff --git a/multi_user/bl_types/bl_user.py b/multi_user/bl_types/bl_user.py index 919605f..1f29deb 100644 --- a/multi_user/bl_types/bl_user.py +++ b/multi_user/bl_types/bl_user.py @@ -1,6 +1,5 @@ import bpy import mathutils -import jsondiff from .. import utils from .. import presence diff --git a/multi_user/bl_types/bl_world.py b/multi_user/bl_types/bl_world.py index 8557581..9e04831 100644 --- a/multi_user/bl_types/bl_world.py +++ b/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 diff --git a/multi_user/delayable.py b/multi_user/delayable.py index 04fb527..6c8d80b 100644 --- a/multi_user/delayable.py +++ b/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): diff --git a/multi_user/libs/replication b/multi_user/libs/replication index e460574..3d5ecc1 160000 --- a/multi_user/libs/replication +++ b/multi_user/libs/replication @@ -1 +1 @@ -Subproject commit e460574b16f74c6e0f289164b7dbc9389068190f +Subproject commit 3d5ecc1782abe1fe144e87617a110c10cb82a11d diff --git a/multi_user/ui.py b/multi_user/ui.py index 4883651..e96362f 100644 --- a/multi_user/ui.py +++ b/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)