From ee83e61b09aae04773fafb58d60f24fd6d606465 Mon Sep 17 00:00:00 2001 From: Swann Date: Tue, 28 Jul 2020 12:05:26 +0200 Subject: [PATCH] fix: None image --- multi_user/__init__.py | 2 +- multi_user/bl_types/bl_armature.py | 4 +++- multi_user/bl_types/bl_object.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/multi_user/__init__.py b/multi_user/__init__.py index a073aee..70586ed 100644 --- a/multi_user/__init__.py +++ b/multi_user/__init__.py @@ -45,7 +45,7 @@ from . import environment, utils # TODO: remove dependency as soon as replication will be installed as a module DEPENDENCIES = { - ("replication", '0.0.19'), + ("replication", '0.0.20'), ("deepdiff", '5.0.1'), } diff --git a/multi_user/bl_types/bl_armature.py b/multi_user/bl_types/bl_armature.py index 2fa8152..045f7a2 100644 --- a/multi_user/bl_types/bl_armature.py +++ b/multi_user/bl_types/bl_armature.py @@ -92,6 +92,7 @@ class BlArmature(BlDatablock): new_bone.head = bone_data['head_local'] new_bone.tail_radius = bone_data['tail_radius'] new_bone.head_radius = bone_data['head_radius'] + new_bone.roll = bone_data['roll'] if 'parent' in bone_data: new_bone.parent = target.edit_bones[data['bones'] @@ -123,7 +124,8 @@ class BlArmature(BlDatablock): 'use_connect', 'parent', 'name', - 'layers' + 'layers', + 'roll', ] data = dumper.dump(instance) diff --git a/multi_user/bl_types/bl_object.py b/multi_user/bl_types/bl_object.py index 60564e3..17ef883 100644 --- a/multi_user/bl_types/bl_object.py +++ b/multi_user/bl_types/bl_object.py @@ -157,7 +157,7 @@ class BlObject(BlDatablock): img_key = data.get('data') if target.data is None and img_key: - target.data = bpy.data.images[img_key] + target.data = bpy.data.images.get(img_key, None) def _dump_implementation(self, data, instance=None): assert(instance)