Merge branch 'develop' into 'master'

fix: cross-platform serialization errors

See merge request slumber/multi-user!177
This commit is contained in:
Swann Martinez 2022-08-07 12:39:06 +00:00
commit 757ee7015a
3 changed files with 4 additions and 4 deletions

View File

@ -19,7 +19,7 @@
bl_info = { bl_info = {
"name": "Multi-User", "name": "Multi-User",
"author": "Swann Martinez", "author": "Swann Martinez",
"version": (0, 5, 5), "version": (0, 5, 7),
"description": "Enable real-time collaborative workflow inside blender", "description": "Enable real-time collaborative workflow inside blender",
"blender": (2, 82, 0), "blender": (2, 82, 0),
"location": "3D View > Sidebar > Multi-User tab", "location": "3D View > Sidebar > Multi-User tab",

View File

@ -24,8 +24,8 @@ import numpy as np
BPY_TO_NUMPY_TYPES = { BPY_TO_NUMPY_TYPES = {
'FLOAT': np.float, 'FLOAT': np.float32,
'INT': np.int, 'INT': np.int32,
'BOOL': np.bool, 'BOOL': np.bool,
'BOOLEAN': np.bool} 'BOOLEAN': np.bool}

View File

@ -31,7 +31,7 @@ DEFAULT_CACHE_DIR = os.path.join(
os.path.dirname(os.path.abspath(__file__)), "cache") os.path.dirname(os.path.abspath(__file__)), "cache")
REPLICATION_DEPENDENCIES = { REPLICATION_DEPENDENCIES = {
"zmq", "zmq",
"deepdiff" "deepdiff==5.7.0"
} }
LIBS = os.path.join(os.path.dirname(os.path.abspath(__file__)), "libs") LIBS = os.path.join(os.path.dirname(os.path.abspath(__file__)), "libs")
REPLICATION = os.path.join(LIBS,"replication") REPLICATION = os.path.join(LIBS,"replication")