fix: ReferenceError in update_external dependency by removing orphan nodes.

Resolve "Lock annotation doesn't sync"

See merge request slumber/multi-user!143

CHANGELOG.md

@@ -186,4 +186,34 @@ All notable changes to this project will be documented in this file.
 - Exception access violation during Undo/Redo
 - Sync missing armature bone Roll
 - Sync missing driver data_path
-- Constraint replication
+- Constraint replication
+
+## [0.4.0] - 2021-07-20
+
+### Added
+
+- Connection preset system (@Kysios)
+- Display connected users active mode (users pannel and viewport) (@Kysios)
+- Delta-based replication
+- Sync timeline marker
+- Sync images settings (@Kysios)
+- Sync parent relation type (@Kysios)
+- Sync uv project modifier
+- Sync FCurves modifiers
+
+### Changed
+
+- User selection optimizations (draw and sync) (@Kysios)
+- Improved shapekey syncing performances
+- Improved gpencil syncing performances
+- Integrate replication as a submodule
+- The dependencies are now installed in a folder(blender addon folder) that no longer requires administrative rights
+- Presence overlay UI optimization (@Kysios)
+
+### Fixed
+
+- User selection bounding box glitches for non-mesh objects (@Kysios)
+- Transforms replication for animated objects
+- GPencil fill stroke
+- Sculpt and GPencil brushes deleted when joining a session (@Kysios)
+- Auto-updater doesn't work for master and develop builds

README.md

@@ -11,9 +11,8 @@ This tool aims to allow multiple users to work on the same scene over the networ
 
 ## Quick installation
 
-1. Download latest release [multi_user.zip](https://gitlab.com/slumber/multi-user/-/jobs/artifacts/master/download?job=build).
-2. Run blender as administrator (dependencies installation).
-3. Install last_version.zip from your addon preferences.
+1. Download [latest build](https://gitlab.com/slumber/multi-user/-/jobs/artifacts/develop/download?job=build) or [stable build](https://gitlab.com/slumber/multi-user/-/jobs/artifacts/master/download?job=build).
+2. Install last_version.zip from your addon preferences.
 
 [Dependencies](#dependencies) will be automatically added to your blender python during installation.
 
@@ -29,35 +28,35 @@ See the [troubleshooting guide](https://slumber.gitlab.io/multi-user/getting_sta
 
 Currently, not all data-block are supported for replication over the wire. The following list summarizes the status for each ones.
 
-| Name           | Status |                           Comment                            |
-| -------------- | :----: | :----------------------------------------------------------: |
-| action         |   ✔️    |                                                              |
-| camera         |   ✔️    |                                                              |
-| collection     |   ✔️    |                                                              |
-| gpencil        |   ✔️    |                                                              |
-| image          |   ✔️    |                                                              |
-| mesh           |   ✔️    |                                                              |
-| material       |   ✔️    |                                                              |
-| node_groups    |   ✔️    |                   Material & Geometry only                   |
-| geometry nodes |   ✔️    |                                                              |
-| metaball       |   ✔️    |                                                              |
-| object         |   ✔️    |                                                              |
-| texts          |   ✔️    |                                                              |
-| scene          |   ✔️    |                                                              |
-| world          |   ✔️    |                                                              |
-| volumes        |   ✔️    |                                                              |
-| lightprobes    |   ✔️    |                                                              |
-| physics        |   ✔️    |                                                              |
-| curve          |   ❗    |                 Nurbs surfaces not supported                 |
-| textures       |   ❗    |       Supported for modifiers/materials/geo nodes only       |
-| armature       |   ❗    |                          Not stable                          |
-| particles      |   ❗    |                   The cache isn't syncing.                   |
-| speakers       |   ❗    | [Partial](https://gitlab.com/slumber/multi-user/-/issues/65) |
-| vse            |   ❗    |               Mask and Clip not supported yet                |
-| libraries      |   ❗    |                           Partial                            |
-| nla            |   ❌    |                                                              |
-| texts          |   ❌    | [Planned](https://gitlab.com/slumber/multi-user/-/issues/81) |
-| compositing    |   ❌    | [Planned](https://gitlab.com/slumber/multi-user/-/issues/46) |
+| Name           | Status |                                 Comment                                 |
+| -------------- | :----: | :---------------------------------------------------------------------: |
+| action         |   ✔️    |                                                                         |
+| camera         |   ✔️    |                                                                         |
+| collection     |   ✔️    |                                                                         |
+| gpencil        |   ✔️    |                                                                         |
+| image          |   ✔️    |                                                                         |
+| mesh           |   ✔️    |                                                                         |
+| material       |   ✔️    |                                                                         |
+| node_groups    |   ✔️    |                        Material & Geometry only                         |
+| geometry nodes |   ✔️    |                                                                         |
+| metaball       |   ✔️    |                                                                         |
+| object         |   ✔️    |                                                                         |
+| texts          |   ✔️    |                                                                         |
+| scene          |   ✔️    |                                                                         |
+| world          |   ✔️    |                                                                         |
+| volumes        |   ✔️    |                                                                         |
+| lightprobes    |   ✔️    |                                                                         |
+| physics        |   ✔️    |                                                                         |
+| textures       |   ✔️    |                                                                         |
+| curve          |   ❗    |                      Nurbs surfaces not supported                       |
+| armature       |   ❗    |          Only for Mesh. [Planned for GPencil](https://gitlab.com/slumber/multi-user/-/issues/161). Not stable yet           |
+| particles      |   ❗    |                        The cache isn't syncing.                         |
+| speakers       |   ❗    |      [Partial](https://gitlab.com/slumber/multi-user/-/issues/65)       |
+| vse            |   ❗    |                     Mask and Clip not supported yet                     |
+| libraries      |   ❌    |                                                                         |
+| nla            |   ❌    |                                                                         |
+| texts          |   ❌    | [Planned for v0.5.0](https://gitlab.com/slumber/multi-user/-/issues/81) |
+| compositing    |   ❌    | [Planned for v0.5.0](https://gitlab.com/slumber/multi-user/-/issues/46) |
 
 
 

docs/getting_started/quickstart.rst

@@ -215,8 +215,10 @@ One of the most vital tools is the **Online user panel**. It lists all connected
 users' information including your own:
 
 * **Role** : if a user is an admin or a regular user.
-* **Location**: Where the user is actually working.
+* **Username** : Name of the user.
+* **Mode** : User's active editing mode (edit_mesh, paint,etc.).
 * **Frame**: When (on which frame) the user is working.
+* **Location**: Where the user is actually working.
 * **Ping**: user's connection delay in milliseconds
 
 .. figure:: img/quickstart_users.png
@@ -273,6 +275,7 @@ it draw users' related information in your viewport such as:
 
 * Username
 * User point of view
+* User active mode
 * User selection
 
 .. figure:: img/quickstart_presence.png

multi_user/__init__.py

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

multi_user/bl_types/bl_gpencil.py

@@ -162,7 +162,7 @@ def dump_layer(layer):
         'hide',
         'annotation_hide',
         'lock',
-        # 'lock_frame',
+        'lock_frame',
         # 'lock_material',
         # 'use_mask_layer',
         'use_lights',
@@ -170,12 +170,13 @@ def dump_layer(layer):
         'select',
         'show_points',
         'show_in_front',
+        # 'thickness'
         # 'parent',
         # 'parent_type',
         # 'parent_bone',
         # 'matrix_inverse',
     ]
-    if layer.id_data.is_annotation:
+    if layer.thickness != 0:
         dumper.include_filter.append('thickness')
 
     dumped_layer = dumper.dump(layer)

multi_user/handlers.py

@@ -79,8 +79,6 @@ def on_scene_update(scene):
             logging.debug(f"Ignoring distant update of {dependency_updates[0].id.name}")
             return
 
-        update_external_dependencies()
-
         # NOTE: maybe we don't need to check each update but only the first
         for update in reversed(dependency_updates):
             update_uuid = getattr(update.id, 'uuid', None)
@@ -109,6 +107,11 @@ def on_scene_update(scene):
                 porcelain.commit(session.repository, scn_uuid)
                 porcelain.push(session.repository, 'origin', scn_uuid)
 
+        scene_graph_changed = [u for u in reversed(dependency_updates) if getattr(u.id, 'uuid', None) and isinstance(u.id,(bpy.types.Scene,bpy.types.Collection))] 
+        if scene_graph_changed:
+            porcelain.purge_orphan_nodes(session.repository)
+
+        update_external_dependencies()
 
 @persistent
 def resolve_deps_graph(dummy):

multi_user/operators.py

@@ -689,7 +689,6 @@ class SessionPurgeOperator(bpy.types.Operator):
 
     def execute(self, context):
         try:
-            sanitize_deps_graph(remove_nodes=True)
             porcelain.purge_orphan_nodes(session.repository)
         except Exception as e:
             self.report({'ERROR'}, repr(e))

multi_user/presence.py

@@ -94,18 +94,21 @@ def project_to_viewport(region: bpy.types.Region, rv3d: bpy.types.RegionView3D,
     return [target.x, target.y, target.z]
 
 
-def bbox_from_obj(obj: bpy.types.Object) -> list:
+def bbox_from_obj(obj: bpy.types.Object, index: int = 1) -> list:
     """ Generate a bounding box for a given object by using its world matrix
 
         :param obj: target object
         :type obj: bpy.types.Object
+        :param index: indice offset
+        :type index: int 
         :return: list of 8 points [(x,y,z),...], list of 12 link between these points [(1,2),...]
     """
     radius = 1.0 # Radius of the bounding box
+    index = 8*index
     vertex_indices = (
-            (0, 1), (0, 2), (1, 3), (2, 3),
-            (4, 5), (4, 6), (5, 7), (6, 7),
-            (0, 4), (1, 5), (2, 6), (3, 7))
+            (0+index, 1+index), (0+index, 2+index), (1+index, 3+index), (2+index, 3+index),
+            (4+index, 5+index), (4+index, 6+index), (5+index, 7+index), (6+index, 7+index),
+            (0+index, 4+index), (1+index, 5+index), (2+index, 6+index), (3+index, 7+index))
 
     if obj.type == 'EMPTY':
         radius = obj.empty_display_size
@@ -117,9 +120,12 @@ def bbox_from_obj(obj: bpy.types.Object) -> list:
         radius = obj.data.display_size
     elif hasattr(obj, 'bound_box'):
         vertex_indices = (
-            (0, 1), (1, 2), (2, 3), (0, 3),
-            (4, 5), (5, 6), (6, 7), (4, 7),
-            (0, 4), (1, 5), (2, 6), (3, 7))
+            (0+index, 1+index), (1+index, 2+index),
+            (2+index, 3+index), (0+index, 3+index),
+            (4+index, 5+index), (5+index, 6+index),
+            (6+index, 7+index), (4+index, 7+index),
+            (0+index, 4+index), (1+index, 5+index),
+            (2+index, 6+index), (3+index, 7+index))
         vertex_pos = get_bb_coords_from_obj(obj)
         return vertex_pos, vertex_indices
 
@@ -136,26 +142,21 @@ def bbox_from_obj(obj: bpy.types.Object) -> list:
 
     return vertex_pos, vertex_indices
 
-def bbox_from_instance_collection(ic: bpy.types.Object) -> list:
+def bbox_from_instance_collection(ic: bpy.types.Object, index: int = 0) -> list:
     """ Generate a bounding box for a given instance collection by using its objects
 
         :param ic: target instance collection
         :type ic: bpy.types.Object
-        :param radius: bounding box radius
-        :type radius: float
+        :param index: indice offset
+        :type index: int
         :return: list of 8*objs points [(x,y,z),...], tuple of 12*objs link between these points [(1,2),...]
     """
     vertex_pos = []
     vertex_indices = ()
 
     for obj_index, obj in enumerate(ic.instance_collection.objects):
-        vertex_pos_temp, vertex_indices_temp = bbox_from_obj(obj)
+        vertex_pos_temp, vertex_indices_temp = bbox_from_obj(obj, index=index+obj_index)
         vertex_pos += vertex_pos_temp
-        vertex_indices_list_temp = list(list(indice) for indice in vertex_indices_temp)
-        for indice in vertex_indices_list_temp:
-            indice[0] += 8*obj_index
-            indice[1] += 8*obj_index
-        vertex_indices_temp = tuple(tuple(indice) for indice in vertex_indices_list_temp)
         vertex_indices += vertex_indices_temp
 
     bbox_corners = [ic.matrix_world @ mathutils.Vector(vertex) for vertex in vertex_pos]
@@ -223,7 +224,7 @@ def get_bb_coords_from_obj(object: bpy.types.Object, instance: bpy.types.Object
 
     bbox_corners = [base @ mathutils.Vector(
         corner) for corner in object.bound_box]
-    
+
 
     return [(point.x, point.y, point.z) for point in bbox_corners]
 
@@ -322,6 +323,8 @@ class UserSelectionWidget(Widget):
             username):
         self.username = username
         self.settings = bpy.context.window_manager.session
+        self.current_selection_ids = []
+        self.current_selected_objects = []
 
     @property
     def data(self):
@@ -331,6 +334,15 @@ class UserSelectionWidget(Widget):
         else:
             return None
 
+    @property
+    def selected_objects(self):
+        user_selection = self.data.get('selected_objects')
+        if self.current_selection_ids != user_selection:
+            self.current_selected_objects = [find_from_attr("uuid", uid, bpy.data.objects) for uid in user_selection]
+            self.current_selection_ids = user_selection
+
+        return self.current_selected_objects
+
     def poll(self):
         if self.data is None:
             return False
@@ -344,27 +356,32 @@ class UserSelectionWidget(Widget):
             self.settings.presence_show_selected and \
             self.settings.enable_presence
 
-    def draw(self):        
-        user_selection = self.data.get('selected_objects')
-        for select_obj in user_selection:
-            obj = find_from_attr("uuid", select_obj, bpy.data.objects)
-            if not obj:
-                return
-            if obj.instance_collection:
-                vertex_pos, vertex_indices = bbox_from_instance_collection(obj)
+    def draw(self):
+        vertex_pos = []
+        vertex_ind = []
+        collection_offset = 0
+        for obj_index, obj in enumerate(self.selected_objects):
+            if obj is None:
+                continue
+            obj_index+=collection_offset
+            if hasattr(obj, 'instance_collection') and obj.instance_collection:
+                bbox_pos, bbox_ind = bbox_from_instance_collection(obj, index=obj_index)
+                collection_offset+=len(obj.instance_collection.objects)-1
             else :
-                vertex_pos, vertex_indices = bbox_from_obj(obj)
+                bbox_pos, bbox_ind = bbox_from_obj(obj, index=obj_index)
+            vertex_pos += bbox_pos
+            vertex_ind += bbox_ind
 
-            shader = gpu.shader.from_builtin('3D_UNIFORM_COLOR')
-            batch = batch_for_shader(
-                shader,
-                'LINES',
-                {"pos": vertex_pos},
-                indices=vertex_indices)
+        shader = gpu.shader.from_builtin('3D_UNIFORM_COLOR')
+        batch = batch_for_shader(
+            shader,
+            'LINES',
+            {"pos": vertex_pos},
+            indices=vertex_ind)
 
-            shader.bind()
-            shader.uniform_float("color", self.data.get('color'))
-            batch.draw(shader)
+        shader.bind()
+        shader.uniform_float("color", self.data.get('color'))
+        batch.draw(shader)
 
 class UserNameWidget(Widget):
     draw_type = 'POST_PIXEL'

multi_user/timers.py

@@ -162,7 +162,7 @@ class AnnotationUpdates(Timer):
                         logging.debug(
                             "Getting the right on the annotation GP")
                         porcelain.lock(session.repository,
-                                        registered_gp.uuid,
+                                        [registered_gp.uuid],
                                         ignore_warnings=True,
                                         affect_dependencies=False)
 
@@ -172,9 +172,10 @@ class AnnotationUpdates(Timer):
 
                 elif self._annotating:
                     porcelain.unlock(session.repository,
-                                    registered_gp.uuid,
+                                    [registered_gp.uuid],
                                     ignore_warnings=True,
                                     affect_dependencies=False)
+                    self._annotating = False
 
 class DynamicRightSelectTimer(Timer):
     def __init__(self, timeout=.1):