From c5f1bf11764c97d51c6a3f20f642fed7ca8435fe Mon Sep 17 00:00:00 2001 From: Swann Martinez Date: Thu, 7 Jul 2022 14:29:32 +0200 Subject: [PATCH 1/4] fix: cross-platform serialization errors --- multi_user/bl_types/dump_anything.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/multi_user/bl_types/dump_anything.py b/multi_user/bl_types/dump_anything.py index 45bd856..0e187c9 100644 --- a/multi_user/bl_types/dump_anything.py +++ b/multi_user/bl_types/dump_anything.py @@ -24,10 +24,10 @@ import numpy as np BPY_TO_NUMPY_TYPES = { - 'FLOAT': np.float, - 'INT': np.int, - 'BOOL': np.bool, - 'BOOLEAN': np.bool} + 'FLOAT': float, + 'INT': int, + 'BOOL': bool, + 'BOOLEAN': bool} PRIMITIVE_TYPES = ['FLOAT', 'INT', 'BOOLEAN'] From 689a565c75bd0d94754171b30f45337cd370263c Mon Sep 17 00:00:00 2001 From: Swann Martinez Date: Thu, 7 Jul 2022 14:34:33 +0200 Subject: [PATCH 2/4] fix: bump version --- multi_user/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multi_user/__init__.py b/multi_user/__init__.py index 3d4ab6f..2ba0960 100644 --- a/multi_user/__init__.py +++ b/multi_user/__init__.py @@ -19,7 +19,7 @@ bl_info = { "name": "Multi-User", "author": "Swann Martinez", - "version": (0, 5, 5), + "version": (0, 5, 6), "description": "Enable real-time collaborative workflow inside blender", "blender": (2, 82, 0), "location": "3D View > Sidebar > Multi-User tab", From 4128a47b88ca7ef6317e69da4abda818188c6160 Mon Sep 17 00:00:00 2001 From: Swann Martinez Date: Sun, 31 Jul 2022 14:57:32 +0200 Subject: [PATCH 3/4] fix: put back numpy types --- multi_user/__init__.py | 2 +- multi_user/bl_types/dump_anything.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/multi_user/__init__.py b/multi_user/__init__.py index 2ba0960..82b9f4d 100644 --- a/multi_user/__init__.py +++ b/multi_user/__init__.py @@ -19,7 +19,7 @@ bl_info = { "name": "Multi-User", "author": "Swann Martinez", - "version": (0, 5, 6), + "version": (0, 5, 7), "description": "Enable real-time collaborative workflow inside blender", "blender": (2, 82, 0), "location": "3D View > Sidebar > Multi-User tab", diff --git a/multi_user/bl_types/dump_anything.py b/multi_user/bl_types/dump_anything.py index 0e187c9..3da447c 100644 --- a/multi_user/bl_types/dump_anything.py +++ b/multi_user/bl_types/dump_anything.py @@ -24,10 +24,10 @@ import numpy as np BPY_TO_NUMPY_TYPES = { - 'FLOAT': float, - 'INT': int, - 'BOOL': bool, - 'BOOLEAN': bool} + 'FLOAT': np.float32, + 'INT': np.int32, + 'BOOL': np.bool, + 'BOOLEAN': np.bool} PRIMITIVE_TYPES = ['FLOAT', 'INT', 'BOOLEAN'] From 15d66579c62aae299929eaae19fc4fb958d1673d Mon Sep 17 00:00:00 2001 From: Swann Martinez Date: Sun, 7 Aug 2022 14:36:36 +0200 Subject: [PATCH 4/4] fix: deepdiff dependency error, freezing it to 5.7.0. --- multi_user/environment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multi_user/environment.py b/multi_user/environment.py index a748cbc..79e57cc 100644 --- a/multi_user/environment.py +++ b/multi_user/environment.py @@ -31,7 +31,7 @@ DEFAULT_CACHE_DIR = os.path.join( os.path.dirname(os.path.abspath(__file__)), "cache") REPLICATION_DEPENDENCIES = { "zmq", - "deepdiff" + "deepdiff==5.7.0" } LIBS = os.path.join(os.path.dirname(os.path.abspath(__file__)), "libs") REPLICATION = os.path.join(LIBS,"replication")