Compare commits

...

16 Commits

Author SHA1 Message Date
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
15d66579c6 fix: deepdiff dependency error, freezing it to 5.7.0. 2022-08-07 14:36:36 +02:00
4128a47b88 fix: put back numpy types 2022-07-31 14:57:32 +02:00
689a565c75 fix: bump version 2022-07-07 14:34:33 +02:00
c5f1bf1176 fix: cross-platform serialization errors 2022-07-07 14:29:32 +02:00
4dc6781c94 Merge branch 'develop' into 'master'
v0.5.5

See merge request slumber/multi-user!176
2022-06-12 19:23:41 +00:00
5311e55208 fix: doc version number 2022-06-12 21:16:11 +02:00
4cb64e5e77 doc: update changelog and version 2022-06-12 21:10:38 +02:00
ff67b581b1 Merge branch '256-numpy-mesh-serialization-error' into 'develop'
Resolve "Numpy mesh serialization error"

See merge request slumber/multi-user!175
2022-06-12 19:04:56 +00:00
5e929db3ee Merge branch 'develop' into 'master'
v0.5.3

See merge request slumber/multi-user!174
2022-03-11 17:59:27 +00:00
0c60c86775 Merge branch 'develop' into 'master'
v0.5.2

See merge request slumber/multi-user!173
2022-02-18 15:12:56 +00:00
6efd1321ce Merge branch 'develop' into 'master'
v0.5.1

See merge request slumber/multi-user!169
2022-02-10 15:25:02 +00:00
4b7573234a Merge branch 'develop' into 'master'
v0.5.0

See merge request slumber/multi-user!164
2022-02-10 13:15:45 +00:00
ac84509b83 Merge branch 'develop' into 'master'
fix: old replication installation conflicts

See merge request slumber/multi-user!145
2021-07-20 14:28:04 +00:00
69565b3852 Merge branch 'develop' into 'master'
v0.4.0

See merge request slumber/multi-user!144
2021-07-20 13:41:29 +00:00
57fdd492ef Merge branch 'develop' into 'master'
fix: auto-updater operators registration to ensure blender 2.93 compatibility

See merge request slumber/multi-user!117
2021-04-15 13:39:47 +00:00
5 changed files with 13 additions and 7 deletions

View File

@ -264,4 +264,10 @@ All notable changes to this project will be documented in this file.
- Server crashing during snapshots
- Blender 3.1 numpy loading error during early connection process
- Server docker arguments
- Server docker arguments
## [0.5.5] - 2022-06-12
### Fixed
- Numpy mesh serialization error

View File

@ -16,12 +16,12 @@ import sys
# -- Project information -----------------------------------------------------
project = 'Multi-User 0.5.0 Documentation'
project = 'Multi-User 0.5.x Documentation'
copyright = '2020, Swann Martinez'
author = 'Swann Martinez, Poochy, Fabian'
# The full version, including alpha/beta/rc tags
version_release = '0.5.1-develop'
version_release = '0.5.5'
# -- General configuration ---------------------------------------------------

View File

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

View File

@ -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}

View File

@ -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")