Merge branch 'develop' into 'master'

fix: cross-platform serialization errors See merge request slumber/multi-user!177
fix: deepdiff dependency error, freezing it to 5.7.0.
2022-08-07 12:39:06 +00:00 · 2022-08-07 14:36:36 +02:00 · 2022-07-31 14:57:32 +02:00 · 2022-07-07 14:34:33 +02:00 · 2022-07-07 14:29:32 +02:00
3 changed files with 4 additions and 4 deletions
--- 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, 7),
    "description": "Enable real-time collaborative workflow inside blender",
    "blender": (2, 82, 0),
    "location": "3D View > Sidebar > Multi-User tab",
--- a/multi_user/bl_types/dump_anything.py
+++ b/multi_user/bl_types/dump_anything.py
@ -24,8 +24,8 @@ import numpy as np


 BPY_TO_NUMPY_TYPES = {
-    'FLOAT': np.float,
-    'INT': np.int,
+    'FLOAT': np.float32,
+    'INT': np.int32,
    'BOOL': np.bool,
    'BOOLEAN': np.bool}

--- 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")
Author	SHA1	Message	Date
Swann Martinez	757ee7015a	Merge branch 'develop' into 'master' fix: cross-platform serialization errors See merge request slumber/multi-user!177	2022-08-07 12:39:06 +00:00
Swann Martinez	15d66579c6	fix: deepdiff dependency error, freezing it to 5.7.0.	2022-08-07 14:36:36 +02:00
Swann Martinez	4128a47b88	fix: put back numpy types	2022-07-31 14:57:32 +02:00
Swann Martinez	689a565c75	fix: bump version	2022-07-07 14:34:33 +02:00
Swann Martinez	c5f1bf1176	fix: cross-platform serialization errors	2022-07-07 14:29:32 +02:00