Merge branch 'develop' into 'master'

v0.5.5

See merge request slumber/multi-user!176

multi_user/__init__.py

@@ -19,7 +19,7 @@
 bl_info = {
     "name": "Multi-User",
     "author": "Swann Martinez",
-    "version": (0, 5, 7),
+    "version": (0, 5, 5),
     "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/dump_anything.py

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

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