Merge branch 'develop' into 'master'

v0.5.1

See merge request slumber/multi-user!169

CHANGELOG.md

@@ -247,27 +247,3 @@ All notable changes to this project will be documented in this file.
 
 - Auto updater breaks dependency auto installer
 - Auto updater update from tag
-
-## [0.5.2] - 2022-02-18
-
-### Fixed
-
-- Objects not selectable after user leaves session
-- Geometry nodes attribute toogle doesn't sync
-
-## [0.5.3] - 2022-03-11
-
-### Changed
-
-- Snapshots logs
-### Fixed
-
-- Server crashing during snapshots
-- Blender 3.1 numpy loading error during early connection process
-- Server docker arguments
-
-## [0.5.5] - 2022-06-12
-
-### Fixed
-
-- Numpy mesh serialization error

docs/conf.py

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

multi_user/__init__.py

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

multi_user/bl_types/bl_material.py

@@ -64,7 +64,7 @@ def load_node(node_data: dict, node_tree: bpy.types.ShaderNodeTree):
             if idx < len(inputs_data) and hasattr(inpt, "default_value"):
                 loaded_input = inputs_data[idx]
                 try:
-                    if inpt.type in ['OBJECT', 'COLLECTION', 'MATERIAL']:
+                    if inpt.type in ['OBJECT', 'COLLECTION']:
                         inpt.default_value = get_datablock_from_uuid(loaded_input, None)
                     else:
                         inpt.default_value = loaded_input
@@ -80,7 +80,7 @@ def load_node(node_data: dict, node_tree: bpy.types.ShaderNodeTree):
             if idx < len(outputs_data) and hasattr(output, "default_value"):
                 loaded_output = outputs_data[idx]
                 try:
-                    if output.type in ['OBJECT', 'COLLECTION', 'MATERIAL']:
+                    if output.type in ['OBJECT', 'COLLECTION']:
                         output.default_value = get_datablock_from_uuid(loaded_output, None)
                     else:
                         output.default_value = loaded_output
@@ -351,11 +351,6 @@ def get_node_tree_dependencies(node_tree: bpy.types.NodeTree) -> list:
 
     def has_texture(node): return (
         node.type in ['ATTRIBUTE_SAMPLE_TEXTURE','TEXTURE']  and node.texture)
-
-    def has_material(node): return (
-        node.type == 'MATERIAL' and node.inputs[2].default_value is not None
-    )
-
     deps = []
 
     for node in node_tree.nodes:
@@ -365,9 +360,7 @@ def get_node_tree_dependencies(node_tree: bpy.types.NodeTree) -> list:
             deps.append(node.node_tree)
         elif has_texture(node):
             deps.append(node.texture)
-        elif has_material(node):
-            print(node.inputs[2].default_value.name)
-            deps.append(node.inputs[2].default_value)
+
     return deps
 
 

multi_user/bl_types/bl_object.py

@@ -172,7 +172,7 @@ def load_modifier_geometry_node_props(dumped_modifier: dict, target_modifier: bp
     for input_index, inpt in enumerate(get_node_group_properties_identifiers(target_modifier.node_group)):
         dumped_value, dumped_type = dumped_modifier['props'][input_index]
         input_value = target_modifier[inpt[0]]
-        if dumped_type in ['INT', 'VALUE', 'STR', 'BOOL']:
+        if dumped_type in ['INT', 'VALUE', 'STR']:
             logging.info(f"{inpt[0]}/{dumped_value}")
             target_modifier[inpt[0]] = dumped_value
         elif dumped_type in ['RGBA', 'VECTOR']:

multi_user/bl_types/dump_anything.py

@@ -26,8 +26,7 @@ import numpy as np
 BPY_TO_NUMPY_TYPES = {
     'FLOAT': np.float32,
     'INT': np.int32,
-    'BOOL': np.bool,
-    'BOOLEAN': np.bool}
+    'BOOL': np.bool}
 
 PRIMITIVE_TYPES = ['FLOAT', 'INT', 'BOOLEAN']
 

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==5.7.0"
+    "deepdiff"
 }
 LIBS = os.path.join(os.path.dirname(os.path.abspath(__file__)), "libs")
 REPLICATION = os.path.join(LIBS,"replication")

scripts/docker_server/Dockerfile

@@ -22,4 +22,4 @@ RUN pip install replication==$replication_version
 
 # Run the server with parameters
 ENTRYPOINT ["/bin/sh", "-c"]
-CMD  ["replication.server -apwd ${password} -spwd '' -p ${port} -t ${timeout} -l ${log_level} -lf ${log_file}"]
+CMD  ["replication.serve -apwd ${password} -spwd '' -p ${port} -t ${timeout} -l ${log_level} -lf ${log_file}"]