.gitlab-ci.yml

@@ -1,7 +1,13 @@
 stages:
+  - test
   - build
+  - deploy
+  - doc
+
 
 
 include:
+  - local: .gitlab/ci/test.gitlab-ci.yml
   - local: .gitlab/ci/build.gitlab-ci.yml
-
+  - local: .gitlab/ci/deploy.gitlab-ci.yml
+  - local: .gitlab/ci/doc.gitlab-ci.yml

.gitlab/ci/build.gitlab-ci.yml

@@ -1,5 +1,6 @@
 build:
   stage: build
+  needs: ["test"]
   image: debian:stable-slim
   script:
     - rm -rf tests .git .gitignore script

.gitlab/ci/test.gitlab-ci.yml

@@ -0,0 +1,7 @@
+test:
+  stage: test
+  image: slumber/blender-addon-testing:latest
+  script:
+    - python3 scripts/test_addon.py
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive

multi_user/__init__.py

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

@@ -245,8 +245,9 @@ def dump_node_tree(node_tree: bpy.types.ShaderNodeTree) -> dict:
         'type': type(node_tree).__name__
     }
 
-    sockets = [item for item in node_tree.interface.items_tree if item.item_type == 'SOCKET']
-    node_tree_data['interface'] = dump_node_tree_sockets(sockets)
+    for socket_id in ['inputs', 'outputs']:
+        socket_collection = getattr(node_tree, socket_id)
+        node_tree_data[socket_id] = dump_node_tree_sockets(socket_collection)
 
     return node_tree_data
 
@@ -262,18 +263,18 @@ def dump_node_tree_sockets(sockets: bpy.types.Collection) -> dict:
     """
     sockets_data = []
     for socket in sockets:
-        sockets_data.append(
-            (
-                socket.name, 
-                socket.socket_type,
-                socket.in_out
-            )
-        )
+        try:
+            socket_uuid = socket['uuid']
+        except Exception:
+            socket_uuid = str(uuid4())
+            socket['uuid'] = socket_uuid
+
+        sockets_data.append((socket.name, socket.bl_socket_idname, socket_uuid))
 
     return sockets_data
 
 
-def load_node_tree_sockets(interface: bpy.types.NodeTreeInterface,
+def load_node_tree_sockets(sockets: bpy.types.Collection,
                            sockets_data: dict):
     """ load sockets of a shader_node_tree
 
@@ -284,17 +285,20 @@ def load_node_tree_sockets(interface: bpy.types.NodeTreeInterface,
         :arg socket_data: dumped socket data
         :type socket_data: dict
     """
-    # Remove old sockets
-    interface.clear()    
+    # Check for removed sockets
+    for socket in sockets:
+        if not [s for s in sockets_data if 'uuid' in socket and socket['uuid'] == s[2]]:
+            sockets.remove(socket)
 
     # Check for new sockets
-    for name, socket_type, in_out  in sockets_data:
-        socket = interface.new_socket(
-            name,
-            in_out=in_out,
-            socket_type=socket_type
-        )
-  
+    for idx, socket_data in enumerate(sockets_data):
+        try:
+            checked_socket = sockets[idx]
+            if checked_socket.name != socket_data[0]:
+                checked_socket.name = socket_data[0]
+        except Exception:
+            s = sockets.new(socket_data[1], socket_data[0])
+            s['uuid'] = socket_data[2]
 
 
 def load_node_tree(node_tree_data: dict, target_node_tree: bpy.types.ShaderNodeTree) -> dict:
@@ -311,8 +315,13 @@ def load_node_tree(node_tree_data: dict, target_node_tree: bpy.types.ShaderNodeT
     if not target_node_tree.is_property_readonly('name'):
         target_node_tree.name = node_tree_data['name']
 
-    if 'interface' in node_tree_data:
-        load_node_tree_sockets(target_node_tree.interface, node_tree_data['interface'])
+    if 'inputs' in node_tree_data:
+        socket_collection = getattr(target_node_tree, 'inputs')
+        load_node_tree_sockets(socket_collection, node_tree_data['inputs'])
+
+    if 'outputs' in node_tree_data:
+        socket_collection = getattr(target_node_tree,  'outputs')
+        load_node_tree_sockets(socket_collection, node_tree_data['outputs'])
 
     # Load nodes
     for node in node_tree_data["nodes"]:

multi_user/bl_types/bl_mesh.py

@@ -37,8 +37,8 @@ VERTICE = ['co']
 
 EDGE = [
     'vertices',
-    # 'crease',
-    # 'bevel_weight',
+    'crease',
+    'bevel_weight',
     'use_seam',
     'use_edge_sharp',
 ]

multi_user/presence.py

@@ -253,9 +253,11 @@ class Widget(object):
         return True
 
     def configure_bgl(self):
-        gpu.state.blend_set('ALPHA')
-        gpu.state.depth_test_set('LESS_EQUAL')
-        gpu.state.line_width_set(2.0)
+        bgl.glLineWidth(2.)
+        bgl.glEnable(bgl.GL_DEPTH_TEST)
+        bgl.glEnable(bgl.GL_BLEND)
+        bgl.glEnable(bgl.GL_LINE_SMOOTH)
+
 
     def draw(self):
         """How to draw the widget
@@ -298,7 +300,7 @@ class UserFrustumWidget(Widget):
 
     def draw(self):
         location = self.data.get('view_corners')
-        shader = gpu.shader.from_builtin('UNIFORM_COLOR')
+        shader = gpu.shader.from_builtin('3D_UNIFORM_COLOR')
         positions = [tuple(coord) for coord in location]
 
         if len(positions) != 7:
@@ -370,7 +372,7 @@ class UserSelectionWidget(Widget):
             vertex_pos += bbox_pos
             vertex_ind += bbox_ind
 
-        shader = gpu.shader.from_builtin('UNIFORM_COLOR')
+        shader = gpu.shader.from_builtin('3D_UNIFORM_COLOR')
         batch = batch_for_shader(
             shader,
             'LINES',
@@ -419,7 +421,7 @@ class UserNameWidget(Widget):
 
         if coords:
             blf.position(0, coords[0], coords[1]+10, 0)
-            blf.size(0, 16)
+            blf.size(0, 16, 72)
             blf.color(0, color[0], color[1], color[2], color[3])
             blf.draw(0,  self.username)
 
@@ -509,7 +511,7 @@ class SessionStatusWidget(Widget):
         vpos = (self.preferences.presence_hud_vpos*bpy.context.area.height)/100
 
         blf.position(0, hpos, vpos, 0)
-        blf.size(0, int(text_scale*ui_scale))
+        blf.size(0, int(text_scale*ui_scale), 72)
         blf.color(0, color[0], color[1], color[2], color[3])
         blf.draw(0,  state_str)