feat: presence overlay button+UInfo in side panel

Resolve "fix ui host and lobby"

See merge request slumber/multi-user!152

CHANGELOG.md

@@ -187,3 +187,33 @@ All notable changes to this project will be documented in this file.
 - Sync missing armature bone Roll
 - Sync missing driver data_path
 - 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).
+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. Run blender as administrator (dependencies installation).
+2. Install last_version.zip from your addon preferences.
-3. Install last_version.zip from your addon preferences.
 
 [Dependencies](#dependencies) will be automatically added to your blender python during installation.
 
@@ -30,7 +29,7 @@ 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     |   ✔️    |                                                                         |
@@ -48,16 +47,16 @@ Currently, not all data-block are supported for replication over the wire. The f
 | volumes        |   ✔️    |                                                                         |
 | lightprobes    |   ✔️    |                                                                         |
 | physics        |   ✔️    |                                                                         |
+| textures       |   ✔️    |                                                                         |
 | curve          |   ❗    |                      Nurbs surfaces not supported                       |
-| textures       |   ❗    |       Supported for modifiers/materials/geo nodes only       |
+| armature       |   ❗    |          Only for Mesh. [Planned for GPencil](https://gitlab.com/slumber/multi-user/-/issues/161). Not stable yet           |
-| 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                            |
+| libraries      |   ❌    |                                                                         |
 | nla            |   ❌    |                                                                         |
-| texts          |   ❌    | [Planned](https://gitlab.com/slumber/multi-user/-/issues/81) |
+| texts          |   ❌    | [Planned for v0.5.0](https://gitlab.com/slumber/multi-user/-/issues/81) |
-| compositing    |   ❌    | [Planned](https://gitlab.com/slumber/multi-user/-/issues/46) |
+| compositing    |   ❌    | [Planned for v0.5.0](https://gitlab.com/slumber/multi-user/-/issues/46) |
 
 
 

docs/conf.py

@@ -19,10 +19,10 @@ import sys
 
 project = 'multi-user'
 copyright = '2020, Swann Martinez'
-author = 'Swann Martinez, with contributions from Poochy'
+author = 'Swann Martinez, Poochy, Fabian'
 
 # The full version, including alpha/beta/rc tags
-release = '0.2.0'
+release = '0.5.0-develop'
 
 
 # -- General configuration ---------------------------------------------------

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

docs/tutorials/hosting_guide.rst

@@ -212,14 +212,14 @@ You can run the dedicated server on any platform by following these steps:
 
     .. code-block:: bash
 
-        replication.server
+        replication.serve
 
 .. hint::
     You can also specify a custom **port** (-p), **timeout** (-t), **admin password** (-pwd), **log level (ERROR, WARNING, INFO or DEBUG)** (-l) and **log file** (-lf) with the following optional arguments
 
     .. code-block:: bash
 
-        replication.server -p 5555 -pwd admin -t 5000 -l INFO -lf server.log
+        replication.serve -p 5555 -pwd admin -t 5000 -l INFO -lf server.log
 
 Here, for example, a server is instantiated on port 5555, with password 'admin', a 5 second timeout, and logging enabled.
 
@@ -562,7 +562,7 @@ The default Docker image essentially runs the equivalent of:
 
     .. code-block:: bash
 
-        replication.server -pwd admin -p 5555 -t 5000 -l DEBUG -lf multiuser_server.log
+        replication.serve -pwd admin -p 5555 -t 5000 -l DEBUG -lf multiuser_server.log
 
 This means the server will be launched with 'admin' as the administrator password, run on ports 5555:5558, use a timeout of 5 seconds, verbose 'DEBUG' log level, and with log files written to 'multiuser_server.log'. See :ref:`cmd-line` for a description of optional parameters.
 
@@ -572,7 +572,7 @@ For example, I would like to launch my server with a different administrator pas
 
     .. code-block:: bash
         
-        python3 -m replication.server -pwd supersecretpassword -p 5555 -t 3000 -l DEBUG -lf logname.log
+        replication.serve -pwd supersecretpassword -p 5555 -t 3000 -l DEBUG -lf logname.log
 
 Now, my configuration should look like this:
 
@@ -691,7 +691,7 @@ We're finally ready to launch the server. Simply run:
 
     .. code-block:: bash
         
-        python3 -m replication.server -p 5555 -pwd admin -t 5000 -l INFO -lf server.log
+        replication.serve -p 5555 -pwd admin -t 5000 -l INFO -lf server.log
 
 See :ref:`cmd-line` for a description of optional parameters
 

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",
@@ -59,7 +59,9 @@ def register():
 
         from . import presence
         from . import operators
+        from . import handlers
         from . import ui
+        from . import icons
         from . import preferences
         from . import addon_updater_ops
 
@@ -67,7 +69,9 @@ def register():
         addon_updater_ops.register(bl_info)
         presence.register()
         operators.register()
+        handlers.register()
         ui.register()
+        icons.register()
     except ModuleNotFoundError as e:
         raise Exception(module_error_msg)
         logging.error(module_error_msg)
@@ -81,21 +85,28 @@ def register():
         type=preferences.SessionUser
     )
     bpy.types.WindowManager.user_index = bpy.props.IntProperty()
+    bpy.types.WindowManager.server_index = bpy.props.IntProperty()
     bpy.types.TOPBAR_MT_file_import.append(operators.menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.append(operators.menu_func_export)
 
 
 def unregister():
     from . import presence
     from . import operators
+    from . import handlers
     from . import ui
+    from . import icons
     from . import preferences
     from . import addon_updater_ops
 
     bpy.types.TOPBAR_MT_file_import.remove(operators.menu_func_import)
+    bpy.types.TOPBAR_MT_file_export.remove(operators.menu_func_export)
 
     presence.unregister()
     addon_updater_ops.unregister()
     ui.unregister()
+    icons.unregister()
+    handlers.unregister()
     operators.unregister()
     preferences.unregister()
 
@@ -103,5 +114,6 @@ def unregister():
     del bpy.types.ID.uuid
     del bpy.types.WindowManager.online_users
     del bpy.types.WindowManager.user_index
+    del bpy.types.WindowManager.server_index
 
     environment.unregister()

multi_user/bl_types/bl_action.py

@@ -219,7 +219,7 @@ def load_fcurve(fcurve_data, fcurve):
 def dump_animation_data(datablock):
     animation_data = {}
     if has_action(datablock):
-            animation_data['action'] = datablock.animation_data.action.name
+        animation_data['action'] = datablock.animation_data.action.uuid
     if has_driver(datablock):
         animation_data['drivers'] = []
         for driver in datablock.animation_data.drivers:
@@ -241,8 +241,10 @@ def load_animation_data(animation_data, datablock):
             for driver in animation_data['drivers']:
                 load_driver(datablock, driver)
 
-        if 'action' in animation_data:
+        action = animation_data.get('action')
-            datablock.animation_data.action = bpy.data.actions[animation_data['action']]
+        if action:
+            action = resolve_datablock_from_uuid(action, bpy.data.actions)
+            datablock.animation_data.action = action
         elif datablock.animation_data.action:
             datablock.animation_data.action = None
 
@@ -259,6 +261,8 @@ def resolve_animation_dependencies(datablock):
 
 
 class BlAction(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "actions"
     bl_class = bpy.types.Action
     bl_check_common = False

multi_user/bl_types/bl_armature.py

@@ -37,6 +37,8 @@ def get_roll(bone: bpy.types.Bone) -> float:
 
 
 class BlArmature(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "armatures"
     bl_class = bpy.types.Armature
     bl_check_common = False

multi_user/bl_types/bl_camera.py

@@ -26,6 +26,8 @@ from .bl_action import dump_animation_data, load_animation_data, resolve_animati
 
 
 class BlCamera(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "cameras"
     bl_class = bpy.types.Camera
     bl_check_common = False
@@ -54,7 +56,7 @@ class BlCamera(ReplicatedDatablock):
         background_images = data.get('background_images')
 
         datablock.background_images.clear()
-
+        # TODO: Use image uuid
         if background_images:
             for img_name, img_data in background_images.items():
                 img_id = img_data.get('image')

multi_user/bl_types/bl_curve.py

@@ -137,6 +137,8 @@ SPLINE_METADATA = [
 
 
 class BlCurve(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "curves"
     bl_class = bpy.types.Curve
     bl_check_common = False

multi_user/bl_types/bl_gpencil.py

@@ -28,7 +28,8 @@ from replication.protocol import ReplicatedDatablock
 from .bl_datablock import resolve_datablock_from_uuid
 from .bl_action import dump_animation_data, load_animation_data, resolve_animation_dependencies
 from ..utils import get_preferences
-
+from ..timers import is_annotating
+from .bl_material import load_materials_slots, dump_materials_slots
 
 STROKE_POINT = [
     'co',
@@ -65,36 +66,9 @@ def dump_stroke(stroke):
 
         :param stroke: target grease pencil stroke
         :type stroke: bpy.types.GPencilStroke
-        :return: dict
+        :return: (p_count, p_data)
     """
-
+    return (len(stroke.points), np_dump_collection(stroke.points, STROKE_POINT))
-    assert(stroke)
-
-    dumper = Dumper()
-    dumper.include_filter = [
-        "aspect",
-        "display_mode",
-        "draw_cyclic",
-        "end_cap_mode",
-        "hardeness",
-        "line_width",
-        "material_index",
-        "start_cap_mode",
-        "uv_rotation",
-        "uv_scale",
-        "uv_translation",
-        "vertex_color_fill",
-    ]
-    dumped_stroke = dumper.dump(stroke)
-
-    # Stoke points
-    p_count = len(stroke.points)
-    dumped_stroke['p_count'] = p_count
-    dumped_stroke['points'] = np_dump_collection(stroke.points, STROKE_POINT)
-
-    # TODO: uv_factor, uv_rotation
-
-    return dumped_stroke
 
 
 def load_stroke(stroke_data, stroke):
@@ -107,12 +81,12 @@ def load_stroke(stroke_data, stroke):
     """
     assert(stroke and stroke_data)
 
-    stroke.points.add(stroke_data["p_count"])
+    stroke.points.add(stroke_data[0])
-    np_load_collection(stroke_data['points'], stroke.points, STROKE_POINT)
+    np_load_collection(stroke_data[1], stroke.points, STROKE_POINT)
 
     # HACK: Temporary fix to trigger a BKE_gpencil_stroke_geometry_update to 
     # fix fill issues
-    stroke.uv_scale = stroke_data["uv_scale"]
+    stroke.uv_scale = 1.0
 
 
 def dump_frame(frame):
@@ -147,10 +121,12 @@ def load_frame(frame_data, frame):
 
     assert(frame and frame_data)
 
+    # Load stroke points
     for stroke_data in frame_data['strokes_points']:
         target_stroke = frame.strokes.new()
         load_stroke(stroke_data, target_stroke)
 
+    # Load stroke metadata
     np_load_collection(frame_data['strokes'], frame.strokes, STROKE)
 
 
@@ -170,7 +146,6 @@ def dump_layer(layer):
         'opacity',
         'channel_color',
         'color',
-        # 'thickness', #TODO: enabling only for annotation
         'tint_color',
         'tint_factor',
         'vertex_paint_opacity',
@@ -187,7 +162,7 @@ def dump_layer(layer):
         'hide',
         'annotation_hide',
         'lock',
-        # 'lock_frame',
+        'lock_frame',
         # 'lock_material',
         # 'use_mask_layer',
         'use_lights',
@@ -195,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)
@@ -255,10 +231,10 @@ class BlGpencil(ReplicatedDatablock):
 
     @staticmethod
     def load(data: dict, datablock: object):
-        datablock.materials.clear()
+        # MATERIAL SLOTS
-        if "materials" in data.keys():
+        src_materials = data.get('materials', None)
-            for mat in data['materials']:
+        if src_materials:
-                datablock.materials.append(bpy.data.materials[mat])
+            load_materials_slots(src_materials, datablock.materials)
 
         loader = Loader()
         loader.load(datablock, data)
@@ -286,7 +262,6 @@ class BlGpencil(ReplicatedDatablock):
         dumper = Dumper()
         dumper.depth = 2
         dumper.include_filter = [
-            'materials',
             'name',
             'zdepth_offset',
             'stroke_thickness_space',
@@ -294,7 +269,7 @@ class BlGpencil(ReplicatedDatablock):
             'stroke_depth_order'
         ]
         data = dumper.dump(datablock)
-
+        data['materials'] = dump_materials_slots(datablock.materials)
         data['layers'] = {}
 
         for layer in datablock.layers:
@@ -323,7 +298,8 @@ class BlGpencil(ReplicatedDatablock):
         return bpy.context.mode == 'OBJECT' \
             or layer_changed(datablock, data) \
             or frame_changed(data) \
-            or get_preferences().sync_flags.sync_during_editmode
+            or get_preferences().sync_flags.sync_during_editmode \
+            or is_annotating(bpy.context)
 
 _type = bpy.types.GreasePencil
 _class = BlGpencil

multi_user/bl_types/bl_image.py

@@ -69,11 +69,12 @@ class BlImage(ReplicatedDatablock):
     @staticmethod
     def load(data: dict, datablock: object):
         loader = Loader()
-        loader.load(data, datablock)
+        loader.load(datablock, data)
 
+        # datablock.name = data.get('name')
         datablock.source = 'FILE'
         datablock.filepath_raw = get_filepath(data['filename'])
-        color_space_name = data["colorspace_settings"]["name"]
+        color_space_name = data.get("colorspace")
 
         if color_space_name:
             datablock.colorspace_settings.name = color_space_name
@@ -92,12 +93,10 @@ class BlImage(ReplicatedDatablock):
             "name",
             # 'source',
             'size',
-            'height',
+            'alpha_mode']
-            'alpha',
-            'float_buffer',
-            'alpha_mode',
-            'colorspace_settings']
         data.update(dumper.dump(datablock))
+        data['colorspace'] = datablock.colorspace_settings.name
+
         return data
 
     @staticmethod
@@ -132,10 +131,7 @@ class BlImage(ReplicatedDatablock):
         if datablock.is_dirty:
             datablock.save()
 
-        if not data or (datablock and (datablock.name != data.get('name'))):
         return True
-        else:
-            return False
 
 _type = bpy.types.Image
 _class = BlImage

multi_user/bl_types/bl_lattice.py

@@ -29,6 +29,8 @@ POINT = ['co', 'weight_softbody', 'co_deform']
 
 
 class BlLattice(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "lattices"
     bl_class = bpy.types.Lattice
     bl_check_common = False

multi_user/bl_types/bl_light.py

@@ -26,6 +26,8 @@ from .bl_action import dump_animation_data, load_animation_data, resolve_animati
 
 
 class BlLight(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "lights"
     bl_class = bpy.types.Light
     bl_check_common = False

multi_user/bl_types/bl_lightprobe.py

@@ -25,6 +25,8 @@ from replication.protocol import ReplicatedDatablock
 from .bl_datablock import resolve_datablock_from_uuid
 
 class BlLightprobe(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "lightprobes"
     bl_class = bpy.types.LightProbe
     bl_check_common = False

multi_user/bl_types/bl_material.py

@@ -124,8 +124,7 @@ def dump_node(node: bpy.types.ShaderNode) -> dict:
         "show_preview",
         "show_texture",
         "outputs",
-        "width_hidden",
+        "width_hidden"
-        "image"
     ]
 
     dumped_node = node_dumper.dump(node)
@@ -388,20 +387,22 @@ def load_materials_slots(src_materials: list, dst_materials: bpy.types.bpy_prop_
 
     for mat_uuid, mat_name in src_materials:
         mat_ref = None
-        if mat_uuid is not None:
+        if mat_uuid:
             mat_ref = get_datablock_from_uuid(mat_uuid, None)
         else:
             mat_ref = bpy.data.materials[mat_name]
-
         dst_materials.append(mat_ref)
 
 
 class BlMaterial(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "materials"
     bl_class = bpy.types.Material
     bl_check_common = False
     bl_icon = 'MATERIAL_DATA'
     bl_reload_parent = False
+    bl_reload_child = True
 
     @staticmethod
     def construct(data: dict) -> object:
@@ -409,8 +410,6 @@ class BlMaterial(ReplicatedDatablock):
 
     @staticmethod
     def load(data: dict, datablock: object):
-        load_animation_data(data.get('animation_data'), datablock)
-
         loader = Loader()
 
         is_grease_pencil = data.get('is_grease_pencil')
@@ -427,6 +426,8 @@ class BlMaterial(ReplicatedDatablock):
                 datablock.use_nodes = True
 
             load_node_tree(data['node_tree'], datablock.node_tree)
+            load_animation_data(data.get('nodes_animation_data'), datablock.node_tree)
+        load_animation_data(data.get('animation_data'), datablock)
 
     @staticmethod
     def dump(datablock: object) -> dict:
@@ -494,8 +495,10 @@ class BlMaterial(ReplicatedDatablock):
             data['grease_pencil'] = gp_mat_dumper.dump(datablock.grease_pencil)
         elif datablock.use_nodes:
             data['node_tree'] = dump_node_tree(datablock.node_tree)
+            data['nodes_animation_data'] = dump_animation_data(datablock.node_tree)
 
         data['animation_data'] = dump_animation_data(datablock)
+
         return data
 
     @staticmethod
@@ -509,7 +512,7 @@ class BlMaterial(ReplicatedDatablock):
 
         if datablock.use_nodes:
             deps.extend(get_node_tree_dependencies(datablock.node_tree))
-
+            deps.extend(resolve_animation_dependencies(datablock.node_tree))
         deps.extend(resolve_animation_dependencies(datablock))
 
         return deps

multi_user/bl_types/bl_mesh.py

@@ -55,6 +55,8 @@ POLYGON = [
 ]
 
 class BlMesh(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "meshes"
     bl_class = bpy.types.Mesh
     bl_check_common = False

multi_user/bl_types/bl_metaball.py

@@ -65,6 +65,8 @@ def load_metaball_elements(elements_data, elements):
 
 
 class BlMetaball(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "metaballs"
     bl_class = bpy.types.MetaBall
     bl_check_common = False

multi_user/bl_types/bl_node_group.py

@@ -28,6 +28,8 @@ from .bl_datablock import resolve_datablock_from_uuid
 from .bl_action import dump_animation_data, load_animation_data, resolve_animation_dependencies
 
 class BlNodeGroup(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "node_groups"
     bl_class = bpy.types.NodeTree
     bl_check_common = False

multi_user/bl_types/bl_object.py

@@ -493,6 +493,8 @@ def load_modifiers_custom_data(dumped_modifiers: dict, modifiers: bpy.types.bpy_
         
             
 class BlObject(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "objects"
     bl_class = bpy.types.Object
     bl_check_common = False
@@ -618,10 +620,8 @@ class BlObject(ReplicatedDatablock):
 
         transform = data.get('transforms', None)
         if transform:
-            datablock.matrix_parent_inverse = mathutils.Matrix(
+            datablock.matrix_parent_inverse = mathutils.Matrix(transform['matrix_parent_inverse'])
-                transform['matrix_parent_inverse'])
             datablock.matrix_basis = mathutils.Matrix(transform['matrix_basis'])
-            datablock.matrix_local = mathutils.Matrix(transform['matrix_local'])
 
 
     @staticmethod

multi_user/bl_types/bl_particle.py

@@ -41,6 +41,8 @@ IGNORED_ATTR = [
 ]
 
 class BlParticle(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "particles"
     bl_class = bpy.types.ParticleSettings
     bl_icon = "PARTICLES"

multi_user/bl_types/bl_scene.py

@@ -403,8 +403,9 @@ class BlScene(ReplicatedDatablock):
             datablock.world = bpy.data.worlds[data['world']]
 
         # Annotation
-        if 'grease_pencil' in data.keys():
+        gpencil_uid = data.get('grease_pencil')
-            datablock.grease_pencil = bpy.data.grease_pencils[data['grease_pencil']]
+        if gpencil_uid:
+            datablock.grease_pencil = resolve_datablock_from_uuid(gpencil_uid, bpy.data.grease_pencils)
 
         if get_preferences().sync_flags.sync_render_settings:
             if 'eevee' in data.keys():
@@ -445,6 +446,15 @@ class BlScene(ReplicatedDatablock):
         elif datablock.sequence_editor and not sequences:
             datablock.sequence_editor_clear()
 
+        # Timeline markers
+        markers = data.get('timeline_markers')
+        if markers:
+            datablock.timeline_markers.clear()
+            for name, frame, camera in markers:
+                marker = datablock.timeline_markers.new(name, frame=frame)
+                if camera:
+                    marker.camera = resolve_datablock_from_uuid(camera, bpy.data.objects)
+                marker.select = False
         # FIXME: Find a better way after the replication big refacotoring
         # Keep other user from deleting collection object by flushing their history
         flush_history()
@@ -461,7 +471,6 @@ class BlScene(ReplicatedDatablock):
             'name',
             'world',
             'id',
-            'grease_pencil',
             'frame_start',
             'frame_end',
             'frame_step',
@@ -517,6 +526,13 @@ class BlScene(ReplicatedDatablock):
                 dumped_sequences[seq.name] = dump_sequence(seq)
             data['sequences'] = dumped_sequences
 
+        # Timeline markers
+        if datablock.timeline_markers:
+            data['timeline_markers'] = [(m.name, m.frame, getattr(m.camera, 'uuid', None)) for m in datablock.timeline_markers]
+
+        if datablock.grease_pencil:
+            data['grease_pencil'] = datablock.grease_pencil.uuid
+ 
         return data
 
     @staticmethod

multi_user/bl_types/bl_speaker.py

@@ -25,6 +25,8 @@ from .bl_datablock import resolve_datablock_from_uuid
 from .bl_action import dump_animation_data, load_animation_data, resolve_animation_dependencies
 
 class BlSpeaker(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "speakers"
     bl_class = bpy.types.Speaker
     bl_check_common = False

multi_user/bl_types/bl_texture.py

@@ -26,6 +26,8 @@ from .bl_action import dump_animation_data, load_animation_data, resolve_animati
 import bpy.types as T
 
 class BlTexture(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "textures"
     bl_class = bpy.types.Texture
     bl_check_common = False

multi_user/bl_types/bl_volume.py

@@ -27,6 +27,8 @@ from .bl_material import dump_materials_slots, load_materials_slots
 from .bl_action import dump_animation_data, load_animation_data, resolve_animation_dependencies
 
 class BlVolume(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "volumes"
     bl_class = bpy.types.Volume
     bl_check_common = False

multi_user/bl_types/bl_world.py

@@ -30,6 +30,8 @@ from .bl_action import dump_animation_data, load_animation_data, resolve_animati
 
 
 class BlWorld(ReplicatedDatablock):
+    use_delta = True
+
     bl_id = "worlds"
     bl_class = bpy.types.World
     bl_check_common = True

multi_user/handlers.py

@@ -0,0 +1,155 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+import logging
+
+import bpy
+from bpy.app.handlers import persistent
+from replication import porcelain
+from replication.constants import RP_COMMON, STATE_ACTIVE, STATE_SYNCING, UP
+from replication.exception import ContextError, NonAuthorizedOperationError
+from replication.interface import session
+
+from . import shared_data, utils
+
+
+def sanitize_deps_graph(remove_nodes: bool = False):
+    """ Cleanup the replication graph
+    """
+    if session and session.state == STATE_ACTIVE:
+        start = utils.current_milli_time()
+        rm_cpt = 0
+        for node in session.repository.graph.values():
+            node.instance = session.repository.rdp.resolve(node.data)
+            if node is None \
+                    or (node.state == UP and not node.instance):
+                if remove_nodes:
+                    try:
+                        porcelain.rm(session.repository,
+                                     node.uuid,
+                                     remove_dependencies=False)
+                        logging.info(f"Removing {node.uuid}")
+                        rm_cpt += 1
+                    except NonAuthorizedOperationError:
+                        continue
+        logging.info(f"Sanitize took { utils.current_milli_time()-start} ms, removed {rm_cpt} nodes")
+
+
+def update_external_dependencies():
+    """Force external dependencies(files such as images) evaluation 
+    """
+    external_types = ['WindowsPath', 'PosixPath', 'Image']
+    nodes_ids = [n.uuid for n in session.repository.graph.values() if n.data['type_id'] in external_types]
+    for node_id in nodes_ids:
+        node = session.repository.graph.get(node_id)
+        if node and node.owner in [session.repository.username, RP_COMMON]:
+            porcelain.commit(session.repository, node_id)
+            porcelain.push(session.repository, 'origin', node_id)
+
+
+@persistent
+def on_scene_update(scene):
+    """Forward blender depsgraph update to replication
+    """
+    if session and session.state == STATE_ACTIVE:
+        context = bpy.context
+        blender_depsgraph = bpy.context.view_layer.depsgraph
+        dependency_updates = [u for u in blender_depsgraph.updates]
+        settings = utils.get_preferences()
+        incoming_updates = shared_data.session.applied_updates
+
+        distant_update = [getattr(u.id, 'uuid', None) for u in dependency_updates if getattr(u.id, 'uuid', None) in incoming_updates]
+        if distant_update:
+            for u in distant_update:
+                shared_data.session.applied_updates.remove(u)
+            logging.debug(f"Ignoring distant update of {dependency_updates[0].id.name}")
+            return
+
+        # 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)
+            if update_uuid:
+                node = session.repository.graph.get(update.id.uuid)
+                check_common = session.repository.rdp.get_implementation(update.id).bl_check_common
+
+                if node and (node.owner == session.repository.username or check_common):
+                    logging.debug(f"Evaluate {update.id.name}")
+                    if node.state == UP:
+                        try:
+                            porcelain.commit(session.repository, node.uuid)
+                            porcelain.push(session.repository,
+                                           'origin', node.uuid)
+                        except ReferenceError:
+                            logging.debug(f"Reference error {node.uuid}")
+                        except ContextError as e:
+                            logging.debug(e)
+                        except Exception as e:
+                            logging.error(e)
+                else:
+                    continue
+            elif isinstance(update.id, bpy.types.Scene):
+                scene = bpy.data.scenes.get(update.id.name)
+                scn_uuid = porcelain.add(session.repository, 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):
+    """Resolve deps graph
+
+    Temporary solution to resolve each node pointers after a Undo.
+    A future solution should be to avoid storing dataclock reference...
+
+    """
+    if session and session.state == STATE_ACTIVE:
+        sanitize_deps_graph(remove_nodes=True)
+
+
+@persistent
+def load_pre_handler(dummy):
+    if session and session.state in [STATE_ACTIVE, STATE_SYNCING]:
+        bpy.ops.session.stop()
+
+
+@persistent
+def update_client_frame(scene):
+    if session and session.state == STATE_ACTIVE:
+        porcelain.update_user_metadata(session.repository, {
+            'frame_current': scene.frame_current
+        })
+
+
+def register():
+    bpy.app.handlers.undo_post.append(resolve_deps_graph)
+    bpy.app.handlers.redo_post.append(resolve_deps_graph)
+
+    bpy.app.handlers.load_pre.append(load_pre_handler)
+    bpy.app.handlers.frame_change_pre.append(update_client_frame)
+
+
+def unregister():
+    bpy.app.handlers.undo_post.remove(resolve_deps_graph)
+    bpy.app.handlers.redo_post.remove(resolve_deps_graph)
+
+    bpy.app.handlers.load_pre.remove(load_pre_handler)
+    bpy.app.handlers.frame_change_pre.remove(update_client_frame)

multi_user/icons/__init__.py

@@ -0,0 +1,45 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+import bpy
+import os
+
+from pathlib import Path
+import bpy.utils.previews
+
+def register():
+
+    global icons_col
+
+    pcoll = bpy.utils.previews.new()
+    icons_dir = os.path.join(os.path.dirname(__file__), ".")
+    for png in Path(icons_dir).rglob("*.png"):
+        pcoll.load(png.stem, str(png), "IMAGE")
+
+    icons_col = pcoll
+
+
+def unregister():
+
+    global icons_col
+
+    try:
+        bpy.utils.previews.remove(icons_col)
+    except Exception:
+        pass
+
+    icons_col = None

multi_user/operators.py

@@ -20,6 +20,7 @@ import asyncio
 import copy
 import gzip
 import logging
+from multi_user.preferences import ServerPreset
 import os
 import queue
 import random
@@ -27,12 +28,13 @@ import shutil
 import string
 import sys
 import time
+import traceback
+from uuid import uuid4
 from datetime import datetime
 from operator import itemgetter
 from pathlib import Path
 from queue import Queue
 from time import gmtime, strftime
-import traceback
 
 from bpy.props import FloatProperty
 
@@ -45,17 +47,18 @@ import bpy
 import mathutils
 from bpy.app.handlers import persistent
 from bpy_extras.io_utils import ExportHelper, ImportHelper
+from replication import porcelain
 from replication.constants import (COMMITED, FETCHED, RP_COMMON, STATE_ACTIVE,
                                    STATE_INITIAL, STATE_SYNCING, UP)
-from replication.protocol import DataTranslationProtocol
 from replication.exception import ContextError, NonAuthorizedOperationError
 from replication.interface import session
-from replication import porcelain
-from replication.repository import Repository
 from replication.objects import Node
+from replication.protocol import DataTranslationProtocol
+from replication.repository import Repository
 
-from . import bl_types, environment, timers, ui, utils
+from . import bl_types, environment, shared_data, timers, ui, utils
-from .presence import SessionStatusWidget, renderer, view3d_find
+from .handlers import on_scene_update, sanitize_deps_graph
+from .presence import SessionStatusWidget, renderer, view3d_find, refresh_sidebar_view
 from .timers import registry
 
 background_execution_queue = Queue()
@@ -80,7 +83,6 @@ def session_callback(name):
 def initialize_session():
     """Session connection init hander 
     """
-    settings = utils.get_preferences()
     runtime_settings = bpy.context.window_manager.session
 
     if not runtime_settings.is_host:
@@ -99,7 +101,7 @@ def initialize_session():
 
         # Step 2: Load nodes
         logging.info("Applying nodes")
-        for node in session.repository.index_sorted:
+        for node in session.repository.heads:
             porcelain.apply(session.repository, node)
 
     logging.info("Registering timers")
@@ -107,12 +109,11 @@ def initialize_session():
     for d in deleyables:
         d.register()
 
-
     # Step 5: Clearing history
     utils.flush_history()
 
     # Step 6: Launch deps graph update handling
-    bpy.app.handlers.depsgraph_update_post.append(depsgraph_evaluation)
+    bpy.app.handlers.depsgraph_update_post.append(on_scene_update)
 
 
 @session_callback('on_exit')
@@ -132,8 +133,8 @@ def on_connection_end(reason="none"):
 
     stop_modal_executor = True
 
-    if depsgraph_evaluation in bpy.app.handlers.depsgraph_update_post:
+    if on_scene_update in bpy.app.handlers.depsgraph_update_post:
-        bpy.app.handlers.depsgraph_update_post.remove(depsgraph_evaluation)
+        bpy.app.handlers.depsgraph_update_post.remove(on_scene_update)
 
     # Step 3: remove file handled
     logger = logging.getLogger()
@@ -141,32 +142,12 @@ def on_connection_end(reason="none"):
         if isinstance(handler, logging.FileHandler):
             logger.removeHandler(handler)
     if reason != "user":
-        bpy.ops.session.notify('INVOKE_DEFAULT', message=f"Disconnected from session. Reason: {reason}. ")
+        bpy.ops.session.notify('INVOKE_DEFAULT', message=f"Disconnected from session. Reason: {reason}. ") #TODO: change op session.notify to add ui + change reason (in replication->interface)
-
-
-# OPERATORS
-class SessionStartOperator(bpy.types.Operator):
-    bl_idname = "session.start"
-    bl_label = "start"
-    bl_description = "connect to a net server"
-
-    host: bpy.props.BoolProperty(default=False)
-
-    @classmethod
-    def poll(cls, context):
-        return True
-
-    def execute(self, context):
-        global deleyables
 
+def setup_logging():
+    """ Session setup logging (host/connect)
+    """
     settings = utils.get_preferences()
-        runtime_settings = context.window_manager.session
-        users = bpy.data.window_managers['WinMan'].online_users
-        admin_pass = settings.password
-
-        users.clear()
-        deleyables.clear()
-
     logger = logging.getLogger()
     if len(logger.handlers) == 1:
         formatter = logging.Formatter(
@@ -190,6 +171,133 @@ class SessionStartOperator(bpy.types.Operator):
 
             handler.setFormatter(formatter)
 
+def setup_timer():
+    """ Session setup timer (host/connect)
+    """
+    settings = utils.get_preferences()
+    deleyables.append(timers.ClientUpdate())
+    deleyables.append(timers.DynamicRightSelectTimer())
+    deleyables.append(timers.ApplyTimer(timeout=settings.depsgraph_update_rate))
+
+    session_update = timers.SessionStatusUpdate()
+    session_user_sync = timers.SessionUserSync()
+    session_background_executor = timers.MainThreadExecutor(execution_queue=background_execution_queue)
+    session_listen = timers.SessionListenTimer(timeout=0.001)
+
+    session_listen.register()
+    session_update.register()
+    session_user_sync.register()
+    session_background_executor.register()
+
+    deleyables.append(session_background_executor)
+    deleyables.append(session_update)
+    deleyables.append(session_user_sync)
+    deleyables.append(session_listen)
+    deleyables.append(timers.AnnotationUpdates())
+
+def get_active_server_preset(context):
+    active_index = context.window_manager.server_index
+    server_presets = utils.get_preferences().server_preset
+
+    active_index = active_index if active_index <= len(server_presets)-1 else 0
+
+    return server_presets[active_index]
+
+# OPERATORS
+class SessionConnectOperator(bpy.types.Operator):
+    bl_idname = "session.connect"
+    bl_label = "connect"
+    bl_description = "connect to a net server"
+
+    @classmethod
+    def poll(cls, context):
+        return True
+
+    def execute(self, context):
+        global deleyables
+
+        settings = utils.get_preferences()
+        users = bpy.data.window_managers['WinMan'].online_users
+        active_server = get_active_server_preset(context)
+        admin_pass = active_server.admin_password if active_server.use_admin_password else None
+        server_pass = active_server.server_password if active_server.use_server_password else ''
+
+        users.clear()
+        deleyables.clear()
+
+        setup_logging()
+
+        bpy_protocol = bl_types.get_data_translation_protocol()
+
+        # Check if supported_datablocks are up to date before starting the
+        # the session
+        for dcc_type_id in bpy_protocol.implementations.keys():
+            if dcc_type_id not in settings.supported_datablocks:
+                logging.info(f"{dcc_type_id} not found, \
+                             regenerate type settings...")
+                settings.generate_supported_types()
+
+
+        if bpy.app.version[1] >= 91:
+            python_binary_path = sys.executable
+        else:
+            python_binary_path = bpy.app.binary_path_python
+
+        repo = Repository(
+            rdp=bpy_protocol,
+            username=settings.username)
+        
+        # Join a session
+        if not active_server.use_admin_password:
+            utils.clean_scene()
+
+        try:
+            porcelain.remote_add(
+                repo,
+                'origin',
+                active_server.ip,
+                active_server.port,
+                server_password=server_pass,
+                admin_password=admin_pass)
+            session.connect(
+                repository= repo,
+                timeout=settings.connection_timeout,
+                server_password=server_pass,
+                admin_password=admin_pass
+            )
+        except Exception as e:
+            self.report({'ERROR'}, str(e))
+            logging.error(str(e))
+
+        # Background client updates service
+        setup_timer()
+
+        return {"FINISHED"}
+
+
+class SessionHostOperator(bpy.types.Operator):
+    bl_idname = "session.host"
+    bl_label = "host"
+    bl_description = "host server"
+
+    @classmethod
+    def poll(cls, context):
+        return True
+
+    def execute(self, context):
+        global deleyables
+
+        settings = utils.get_preferences()
+        runtime_settings = context.window_manager.session
+        users = bpy.data.window_managers['WinMan'].online_users
+        admin_pass = settings.host_admin_password if settings.host_use_admin_password else None
+        server_pass = settings.host_server_password if settings.host_use_server_password else ''
+
+        users.clear()
+        deleyables.clear()
+
+        setup_logging()
+
         bpy_protocol = bl_types.get_data_translation_protocol()
 
         # Check if supported_datablocks are up to date before starting the
@@ -211,13 +319,9 @@ class SessionStartOperator(bpy.types.Operator):
             username=settings.username)
     
         # Host a session
-        if self.host:
         if settings.init_method == 'EMPTY':
             utils.clean_scene()
 
-            runtime_settings.is_host = True
-            runtime_settings.internet_ip = environment.get_ip()
-
         try:
             # Init repository
             for scene in bpy.data.scenes:
@@ -227,13 +331,15 @@ class SessionStartOperator(bpy.types.Operator):
                 repo,
                 'origin',
                 '127.0.0.1',
-                    settings.port,
+                settings.host_port,
+                server_password=server_pass,
                 admin_password=admin_pass)
             session.host(
                 repository= repo,
                 remote='origin',
                 timeout=settings.connection_timeout,
-                    password=admin_pass,
+                server_password=server_pass,
+                admin_password=admin_pass,
                 cache_directory=settings.cache_directory,
                 server_log_level=logging.getLevelName(
                     logging.getLogger().level),
@@ -242,49 +348,9 @@ class SessionStartOperator(bpy.types.Operator):
             self.report({'ERROR'}, repr(e))
             logging.error(f"Error: {e}")
             traceback.print_exc()
-        # Join a session
-        else:
-            if not runtime_settings.admin:
-                utils.clean_scene()
-                # regular session, no password needed
-                admin_pass = None
-
-            try:
-                porcelain.remote_add(
-                    repo,
-                    'origin',
-                    settings.ip,
-                    settings.port,
-                    admin_password=admin_pass)
-                session.connect(
-                    repository= repo,
-                    timeout=settings.connection_timeout,
-                    password=admin_pass
-                )
-            except Exception as e:
-                self.report({'ERROR'}, str(e))
-                logging.error(str(e))
 
         # Background client updates service
-        deleyables.append(timers.ClientUpdate())
+        setup_timer()
-        deleyables.append(timers.DynamicRightSelectTimer())
-        deleyables.append(timers.ApplyTimer(timeout=settings.depsgraph_update_rate))
-
-        session_update = timers.SessionStatusUpdate()
-        session_user_sync = timers.SessionUserSync()
-        session_background_executor = timers.MainThreadExecutor(
-            execution_queue=background_execution_queue)
-        session_listen = timers.SessionListenTimer(timeout=0.001)
-
-        session_listen.register()
-        session_update.register()
-        session_user_sync.register()
-        session_background_executor.register()
-
-        deleyables.append(session_background_executor)
-        deleyables.append(session_update)
-        deleyables.append(session_user_sync)
-        deleyables.append(session_listen)
 
         return {"FINISHED"}
 
@@ -603,9 +669,9 @@ class SessionApply(bpy.types.Operator):
             node_ref = session.repository.graph.get(self.target)
             porcelain.apply(session.repository,
                             self.target,
-                            force=True,
+                            force=True)
-                            force_dependencies=self.reset_dependencies)
             impl = session.repository.rdp.get_implementation(node_ref.instance)
+            # NOTE: find another way to handle child and parent automatic reloading
             if impl.bl_reload_parent:
                 for parent in session.repository.graph.get_parents(self.target):
                     logging.debug(f"Refresh parent {parent}")
@@ -613,6 +679,11 @@ class SessionApply(bpy.types.Operator):
                     porcelain.apply(session.repository,
                                     parent.uuid,
                                     force=True)
+            if hasattr(impl, 'bl_reload_child') and impl.bl_reload_child:
+                for dep in node_ref.dependencies:
+                    porcelain.apply(session.repository,
+                                    dep,
+                                    force=True)
         except Exception as e:
             self.report({'ERROR'}, repr(e))
             traceback.print_exc()
@@ -636,7 +707,7 @@ class SessionCommit(bpy.types.Operator):
     def execute(self, context):
         try:
             porcelain.commit(session.repository, self.target)
-            porcelain.push(session.repository, 'origin', self.target)
+            porcelain.push(session.repository, 'origin', self.target, force=True)
             return {"FINISHED"}
         except Exception as e:
             self.report({'ERROR'}, repr(e))
@@ -683,7 +754,7 @@ 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))
 
@@ -716,7 +787,6 @@ class SessionNotifyOperator(bpy.types.Operator):
         layout = self.layout
         layout.row().label(text=self.message)
 
-
     def invoke(self, context, event):
         return context.window_manager.invoke_props_dialog(self)
 
@@ -778,7 +848,6 @@ class SessionStopAutoSaveOperator(bpy.types.Operator):
 
         return {'FINISHED'}
 
-
 class SessionLoadSaveOperator(bpy.types.Operator, ImportHelper):
     bl_idname = "session.load"
     bl_label = "Load session save"
@@ -826,11 +895,89 @@ class SessionLoadSaveOperator(bpy.types.Operator, ImportHelper):
 class SessionPresetServerAdd(bpy.types.Operator):
     """Add a server to the server list preset"""
     bl_idname = "session.preset_server_add"
-    bl_label = "add server preset"
+    bl_label = "Add server preset"
-    bl_description = "add the current server to the server preset list"
+    bl_description = "add a server to the server preset list"
     bl_options = {"REGISTER"}
 
-    name : bpy.props.StringProperty(default="server_preset")
+    server_name: bpy.props.StringProperty(default="")
+    ip: bpy.props.StringProperty(default="127.0.0.1")
+    port: bpy.props.IntProperty(default=5555)
+    use_server_password: bpy.props.BoolProperty(default=False)
+    server_password: bpy.props.StringProperty(default="", subtype = "PASSWORD")
+    use_admin_password: bpy.props.BoolProperty(default=False)
+    admin_password: bpy.props.StringProperty(default="", subtype = "PASSWORD")
+
+    @classmethod
+    def poll(cls, context):
+        return True
+
+    def invoke(self, context, event):
+        self.server_name = ""
+        self.ip = "127.0.0.1"
+        self.port = 5555
+        self.use_server_password = False
+        self.server_password = ""
+        self.use_admin_password = False
+        self.admin_password = ""
+
+        assert(context)
+        return context.window_manager.invoke_props_dialog(self)
+
+    def draw(self, context):
+        layout = self.layout
+
+        row = layout.row() 
+        row.prop(self, "server_name", text="Server name")
+        row = layout.row(align = True)
+        row.prop(self, "ip", text="IP+port")
+        row.prop(self, "port", text="")
+        row = layout.row()
+        col = row.column()
+        col.prop(self, "use_server_password", text="Server password:")
+        col = row.column()
+        col.enabled = True if self.use_server_password else False
+        col.prop(self, "server_password", text="")
+        row = layout.row()
+        col = row.column()
+        col.prop(self, "use_admin_password", text="Admin password:")
+        col = row.column()
+        col.enabled = True if self.use_admin_password else False
+        col.prop(self, "admin_password", text="")
+        
+    def execute(self, context):
+        assert(context)
+
+        settings = utils.get_preferences()
+        existing_preset = settings.get_server_preset(self.server_name)
+
+        new_server = existing_preset if existing_preset else settings.server_preset.add()
+        new_server.name = str(uuid4())
+        new_server.server_name = self.server_name
+        new_server.ip = self.ip
+        new_server.port = self.port
+        new_server.use_server_password = self.use_server_password
+        new_server.server_password = self.server_password
+        new_server.use_admin_password = self.use_admin_password
+        new_server.admin_password = self.admin_password
+
+        refresh_sidebar_view()
+
+        if new_server == existing_preset :
+            self.report({'INFO'}, "Server '" + self.server_name + "' edited")
+        else :
+            self.report({'INFO'}, "New '" + self.server_name + "' server preset")
+
+        return {'FINISHED'}
+
+
+class SessionPresetServerEdit(bpy.types.Operator): # TODO : use preset, not settings
+    """Edit a server to the server list preset"""
+    bl_idname = "session.preset_server_edit"
+    bl_label = "Edit server preset"
+    bl_description = "Edit a server from the server preset list"
+    bl_options = {"REGISTER"}
+
+    target_server_name: bpy.props.StringProperty(default="None")
 
     @classmethod
     def poll(cls, context):
@@ -842,35 +989,39 @@ class SessionPresetServerAdd(bpy.types.Operator):
 
     def draw(self, context):
         layout = self.layout
-
-        col = layout.column()
         settings = utils.get_preferences()
+        settings_active_server = settings.server_preset.get(self.target_server_name)
         
-        col.prop(settings, "server_name", text="server name")
+        row = layout.row()
+        row.prop(settings_active_server, "server_name", text="Server name")
+        row = layout.row(align = True)
+        row.prop(settings_active_server, "ip", text="IP+port")
+        row.prop(settings_active_server, "port", text="")
+        row = layout.row()
+        col = row.column()
+        col.prop(settings_active_server, "use_server_password", text="Server password:")
+        col = row.column()
+        col.enabled = True if settings_active_server.use_server_password else False
+        col.prop(settings_active_server, "server_password", text="")
+        row = layout.row()
+        col = row.column()
+        col.prop(settings_active_server, "use_admin_password", text="Admin password:")
+        col = row.column()
+        col.enabled = True if settings_active_server.use_admin_password else False
+        col.prop(settings_active_server, "admin_password", text="")
         
     def execute(self, context):
         assert(context)
 
         settings = utils.get_preferences()
+        settings_active_server = settings.server_preset.get(self.target_server_name)
 
-        existing_preset = settings.server_preset.get(settings.server_name)
+        refresh_sidebar_view()
 
-        new_server = existing_preset if existing_preset else settings.server_preset.add()
+        self.report({'INFO'}, "Server '" + settings_active_server.server_name + "' edited")
-        new_server.name = settings.server_name
-        new_server.server_ip = settings.ip
-        new_server.server_port = settings.port
-        new_server.server_password = settings.password
-
-        settings.server_preset_interface = settings.server_name
-
-        if new_server == existing_preset :
-            self.report({'INFO'}, "Server '" + settings.server_name + "' override")
-        else :
-            self.report({'INFO'}, "New '" + settings.server_name + "' server preset")
 
         return {'FINISHED'}
 
-
 class SessionPresetServerRemove(bpy.types.Operator):
     """Remove a server to the server list preset"""
     bl_idname = "session.preset_server_remove"
@@ -878,6 +1029,8 @@ class SessionPresetServerRemove(bpy.types.Operator):
     bl_description = "remove the current server from the server preset list"
     bl_options = {"REGISTER"}
     
+    target_server_name: bpy.props.StringProperty(default="None")
+
     @classmethod
     def poll(cls, context):
         return True
@@ -886,19 +1039,77 @@ class SessionPresetServerRemove(bpy.types.Operator):
         assert(context)
 
         settings = utils.get_preferences()
-
+        settings.server_preset.remove(settings.server_preset.find(self.target_server_name))
-        settings.server_preset.remove(settings.server_preset.find(settings.server_preset_interface))
 
         return {'FINISHED'}
         
+class RefreshServerStatus(bpy.types.Operator):
+    bl_idname = "session.get_info"
+    bl_label = "Get session info"
+    bl_description = "Get session info"
 
+    target_server: bpy.props.StringProperty(default="127.0.0.1:5555")
+
+    @classmethod
+    def poll(cls, context):
+        return (session.state != STATE_ACTIVE)
+
+    def execute(self, context):
+        settings = utils.get_preferences()
+
+        for server in settings.server_preset:
+            infos = porcelain.request_session_info(f"{server.ip}:{server.port}", timeout=settings.ping_timeout)
+            server.is_online = True if infos else False
+            if server.is_online:
+                server.is_private = infos.get("private")
+
+        return {'FINISHED'}
+
+class GetDoc(bpy.types.Operator):
+    """Get the documentation of the addon"""
+    bl_idname = "doc.get"
+    bl_label = "Multi-user's doc"
+    bl_description = "Go to the doc of the addon"
+
+    @classmethod
+    def poll(cls, context):
+        return True
+
+    def execute(self, context):
+        assert(context)
+        bpy.ops.wm.url_open(url="https://slumber.gitlab.io/multi-user/index.html")
+
+        return {'FINISHED'}
+
+class FirstLaunch(bpy.types.Operator):
+    """First time lauching the addon"""
+    bl_idname = "firstlaunch.verify"
+    bl_label = "First launch"
+    bl_description = "First time lauching the addon"
+
+    @classmethod
+    def poll(cls, context):
+        return True
+
+    def execute(self, context):
+        assert(context)
+        settings = utils.get_preferences()
+        settings.is_first_launch = False
+        settings.server_preset.clear()
+        prefs = bpy.context.preferences.addons[__package__].preferences
+        prefs.generate_default_presets()
+        return {'FINISHED'}
 
 def menu_func_import(self, context):
     self.layout.operator(SessionLoadSaveOperator.bl_idname, text='Multi-user session snapshot (.db)')
 
+def menu_func_export(self, context):
+    self.layout.operator(SessionSaveBackupOperator.bl_idname, text='Multi-user session snapshot (.db)')
+
 
 classes = (
-    SessionStartOperator,
+    SessionConnectOperator,
+    SessionHostOperator,
     SessionStopOperator,
     SessionPropertyRemoveOperator,
     SessionSnapUserOperator,
@@ -915,114 +1126,14 @@ classes = (
     SessionStopAutoSaveOperator,
     SessionPurgeOperator,
     SessionPresetServerAdd,
+    SessionPresetServerEdit,
     SessionPresetServerRemove,
+    RefreshServerStatus,
+    GetDoc,
+    FirstLaunch,
 )
 
 
-def update_external_dependencies():
-    nodes_ids = [n.uuid for n in session.repository.graph.values() if n.data['type_id'] in ['WindowsPath', 'PosixPath']]
-    for node_id in nodes_ids:
-        node = session.repository.graph.get(node_id)
-        if node and node.owner in [session.repository.username, RP_COMMON]:
-            porcelain.commit(session.repository, node_id)
-            porcelain.push(session.repository,'origin', node_id)
-
-
-def sanitize_deps_graph(remove_nodes: bool = False):
-    """ Cleanup the replication graph
-    """
-    if session and session.state == STATE_ACTIVE:
-        start = utils.current_milli_time()
-        rm_cpt = 0
-        for node in session.repository.graph.values():
-            node.instance = session.repository.rdp.resolve(node.data)
-            if node is None \
-                    or (node.state == UP and not node.instance):
-                if remove_nodes:
-                    try:
-                        porcelain.rm(session.repository,
-                                     node.uuid,
-                                     remove_dependencies=False)
-                        logging.info(f"Removing {node.uuid}")
-                        rm_cpt += 1
-                    except NonAuthorizedOperationError:
-                        continue
-        logging.info(f"Sanitize took { utils.current_milli_time()-start} ms, removed {rm_cpt} nodes")
-
-
-@persistent
-def resolve_deps_graph(dummy):
-    """Resolve deps graph
-
-    Temporary solution to resolve each node pointers after a Undo.
-    A future solution should be to avoid storing dataclock reference...
-
-    """
-    if session and session.state == STATE_ACTIVE:
-        sanitize_deps_graph(remove_nodes=True)
-
-
-@persistent
-def load_pre_handler(dummy):
-    if session and session.state in [STATE_ACTIVE, STATE_SYNCING]:
-        bpy.ops.session.stop()
-
-
-@persistent
-def update_client_frame(scene):
-    if session and session.state == STATE_ACTIVE:
-        porcelain.update_user_metadata(session.repository, {
-            'frame_current': scene.frame_current
-        })
-
-
-@persistent
-def depsgraph_evaluation(scene):
-    if session and session.state == STATE_ACTIVE:
-        context = bpy.context
-        blender_depsgraph = bpy.context.view_layer.depsgraph
-        dependency_updates = [u for u in blender_depsgraph.updates]
-        settings = utils.get_preferences()
-
-        update_external_dependencies()
-
-        is_internal = [u for u in dependency_updates if u.is_updated_geometry or u.is_updated_shading or u.is_updated_transform]
-
-        # NOTE: maybe we don't need to check each update but only the first
-        if not is_internal:
-            return
-        for update in reversed(dependency_updates):
-            # Is the object tracked ?
-            if update.id.uuid:
-                # Retrieve local version
-                node = session.repository.graph.get(update.id.uuid)
-                check_common = session.repository.rdp.get_implementation(update.id).bl_check_common
-                # Check our right on this update:
-                #   - if its ours or ( under common and diff), launch the
-                # update process
-                #   - if its to someone else, ignore the update
-                if node and (node.owner == session.repository.username or check_common):
-                    if node.state == UP:
-                        try:
-                            porcelain.commit(session.repository, node.uuid)
-                            porcelain.push(session.repository, 'origin', node.uuid)
-                        except ReferenceError:
-                            logging.debug(f"Reference error {node.uuid}")
-                        except ContextError as e:
-                            logging.debug(e) 
-                        except Exception as e:
-                            logging.error(e)
-                else:
-                    continue
-            # A new scene is created 
-            elif isinstance(update.id, bpy.types.Scene):
-                ref = session.repository.get_node_by_datablock(update.id)
-                if ref:
-                    pass
-                else:
-                    scn_uuid = porcelain.add(session.repository, update.id)
-                    porcelain.commit(session.node_id, scn_uuid)
-                    porcelain.push(session.repository,'origin', scn_uuid)
 def register():
     from bpy.utils import register_class
 
@@ -1030,13 +1141,6 @@ def register():
         register_class(cls)
 
 
-    bpy.app.handlers.undo_post.append(resolve_deps_graph)
-    bpy.app.handlers.redo_post.append(resolve_deps_graph)
-
-    bpy.app.handlers.load_pre.append(load_pre_handler)
-    bpy.app.handlers.frame_change_pre.append(update_client_frame)
-
-
 def unregister():
     if session and session.state == STATE_ACTIVE:
         session.disconnect()
@@ -1044,9 +1148,3 @@ def unregister():
     from bpy.utils import unregister_class
     for cls in reversed(classes):
         unregister_class(cls)
-
-    bpy.app.handlers.undo_post.remove(resolve_deps_graph)
-    bpy.app.handlers.redo_post.remove(resolve_deps_graph)
-
-    bpy.app.handlers.load_pre.remove(load_pre_handler)
-    bpy.app.handlers.frame_change_pre.remove(update_client_frame)

multi_user/preferences.py

@@ -17,6 +17,7 @@
 
 import random
 import logging
+from uuid import uuid4
 import bpy
 import string
 import re
@@ -25,7 +26,7 @@ import os
 from pathlib import Path
 
 from . import bl_types, environment, addon_updater_ops, presence, ui
-from .utils import get_preferences, get_expanded_icon
+from .utils import get_preferences, get_expanded_icon, get_folder_size
 from replication.constants import RP_COMMON
 from replication.interface import session
 
@@ -33,15 +34,21 @@ from replication.interface import session
 IP_REGEX = re.compile("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$")
 HOSTNAME_REGEX = re.compile("^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$")
 
+#SERVER PRESETS AT LAUNCH
 DEFAULT_PRESETS = {
     "localhost" : {
-        "server_ip": "localhost",
+        "server_name": "localhost",
-        "server_port": 5555,
+        "ip": "localhost",
-        "server_password": "admin"
+        "port": 5555,
+        "use_admin_password": True,
+        "admin_password": "admin",
+        "server_password": ""
     },
     "public session" : {
-        "server_ip": "51.75.71.183",
+        "server_name": "public session",
-        "server_port": 5555,
+        "ip": "51.75.71.183",
+        "port": 5555,
+        "admin_password": "",
         "server_password": ""
     },
 }
@@ -78,11 +85,6 @@ def update_ip(self, context):
         logging.error("Wrong IP format")
         self['ip'] = "127.0.0.1"
 
-def update_server_preset_interface(self, context):
-    self.server_name = self.server_preset.get(self.server_preset_interface).name
-    self.ip = self.server_preset.get(self.server_preset_interface).server_ip
-    self.port = self.server_preset.get(self.server_preset_interface).server_port
-    self.password = self.server_preset.get(self.server_preset_interface).server_password 
 
 def update_directory(self, context):
     new_dir = Path(self.cache_directory)
@@ -110,9 +112,15 @@ class ReplicatedDatablock(bpy.types.PropertyGroup):
     icon: bpy.props.StringProperty()
 
 class ServerPreset(bpy.types.PropertyGroup):
-    server_ip: bpy.props.StringProperty()
+    server_name: bpy.props.StringProperty(default="")
-    server_port: bpy.props.IntProperty(default=5555)
+    ip: bpy.props.StringProperty(default="127.0.0.1", update=update_ip)
-    server_password: bpy.props.StringProperty(default="admin", subtype = "PASSWORD")
+    port: bpy.props.IntProperty(default=5555)
+    use_server_password: bpy.props.BoolProperty(default=False)
+    server_password: bpy.props.StringProperty(default="", subtype = "PASSWORD")
+    use_admin_password: bpy.props.BoolProperty(default=False)
+    admin_password: bpy.props.StringProperty(default="", subtype = "PASSWORD")
+    is_online: bpy.props.BoolProperty(default=False)
+    is_private: bpy.props.BoolProperty(default=False)
 
 def set_sync_render_settings(self, value):
     self['sync_render_settings'] = value
@@ -162,35 +170,60 @@ class ReplicationFlags(bpy.types.PropertyGroup):
 class SessionPrefs(bpy.types.AddonPreferences):
     bl_idname = __package__
 
-    ip: bpy.props.StringProperty(
+    # User settings
-        name="ip",
-        description='Distant host ip',
-        default="localhost",
-        update=update_ip)
     username: bpy.props.StringProperty(
         name="Username",
         default=f"user_{random_string_digits()}"
     )
     client_color: bpy.props.FloatVectorProperty(
         name="client_instance_color",
+        description='User color',
         subtype='COLOR',
-        default=randomColor())
+        default=randomColor()
-    port: bpy.props.IntProperty(
-        name="port",
-        description='Distant host port',
-        default=5555
     )
+    # Current server settings
     server_name: bpy.props.StringProperty(
         name="server_name",
         description="Custom name of the server",
         default='localhost',
     )
-    password: bpy.props.StringProperty(
+    server_index: bpy.props.IntProperty(
-        name="password",
+        name="server_index",
-        default=random_string_digits(),
+        description="index of the server",
+    )
+    # User host session settings
+    host_port: bpy.props.IntProperty(
+        name="host_port",
+        description='Distant host port',
+        default=5555
+    )
+    host_use_server_password: bpy.props.BoolProperty(
+        name="use_server_password",
+        description='Use session password',
+        default=False
+    )
+    host_server_password: bpy.props.StringProperty(
+        name="server_password",
         description='Session password',
         subtype='PASSWORD'
     )
+    host_use_admin_password: bpy.props.BoolProperty(
+        name="use_admin_password",
+        description='Use admin password',
+        default=True
+    )
+    host_admin_password: bpy.props.StringProperty(
+        name="admin_password",
+        description='Admin password',
+        subtype='PASSWORD',
+        default='admin'
+    )
+    # Other
+    is_first_launch: bpy.props.BoolProperty(
+        name="is_fnirst_launch",
+        description="First time lauching the addon",
+        default=True
+    )
     sync_flags: bpy.props.PointerProperty(
         type=ReplicationFlags
     )
@@ -214,6 +247,11 @@ class SessionPrefs(bpy.types.AddonPreferences):
         description='connection timeout before disconnection',
         default=5000
     )
+    ping_timeout: bpy.props.IntProperty(
+        name='ping timeout',
+        description='check if servers are online',
+        default=500
+    )
     # Replication update settings
     depsgraph_update_rate: bpy.props.FloatProperty(
         name='depsgraph update rate (s)',
@@ -225,11 +263,12 @@ class SessionPrefs(bpy.types.AddonPreferences):
         description="Remove filecache from memory",
         default=False
     )
-    # for UI
+    # For UI
     category: bpy.props.EnumProperty(
         name="Category",
         description="Preferences Category",
         items=[
+            ('PREF', "Preferences", "Preferences of this add-on"),
             ('CONFIG', "Configuration", "Configuration of this add-on"),
             ('UPDATE', "Update", "Update this add-on"),
         ],
@@ -273,31 +312,58 @@ class SessionPrefs(bpy.types.AddonPreferences):
         step=1,
         subtype='PERCENTAGE',
     )
+    presence_text_distance: bpy.props.FloatProperty(
+        name="Distance text visibilty",
+        description="Adjust the distance visibilty of user's mode/name",
+        min=0.1,
+        max=10000,
+        default=100,
+    )
     conf_session_identity_expanded: bpy.props.BoolProperty(
         name="Identity",
         description="Identity",
-        default=True
+        default=False
     )
     conf_session_net_expanded: bpy.props.BoolProperty(
         name="Net",
         description="net",
-        default=True
+        default=False
     )
     conf_session_hosting_expanded: bpy.props.BoolProperty(
         name="Rights",
         description="Rights",
         default=False
     )
+    conf_session_rep_expanded: bpy.props.BoolProperty(
+        name="Replication",
+        description="Replication",
+        default=False
+    )
     conf_session_cache_expanded: bpy.props.BoolProperty(
         name="Cache",
         description="cache",
         default=False
     )
+    conf_session_log_expanded: bpy.props.BoolProperty(
+        name="conf_session_log_expanded",
+        description="conf_session_log_expanded",
+        default=False
+    )
     conf_session_ui_expanded: bpy.props.BoolProperty(
         name="Interface",
         description="Interface",
         default=False
     )
+    sidebar_repository_shown: bpy.props.BoolProperty(
+        name="sidebar_repository_shown",
+        description="sidebar_repository_shown",
+        default=False
+    )
+    sidebar_advanced_shown: bpy.props.BoolProperty(
+        name="sidebar_advanced_shown",
+        description="sidebar_advanced_shown",
+        default=False
+    )
     sidebar_advanced_rep_expanded: bpy.props.BoolProperty(
         name="sidebar_advanced_rep_expanded",
         description="sidebar_advanced_rep_expanded",
@@ -308,6 +374,11 @@ class SessionPrefs(bpy.types.AddonPreferences):
         description="sidebar_advanced_log_expanded",
         default=False
     )
+    sidebar_advanced_uinfo_expanded: bpy.props.BoolProperty(
+        name="sidebar_advanced_uinfo_expanded",
+        description="sidebar_advanced_uinfo_expanded",
+        default=False
+    )
     sidebar_advanced_net_expanded: bpy.props.BoolProperty(
         name="sidebar_advanced_net_expanded",
         description="sidebar_advanced_net_expanded",
@@ -364,12 +435,6 @@ class SessionPrefs(bpy.types.AddonPreferences):
         name="server preset",
         type=ServerPreset,
     )
-    server_preset_interface: bpy.props.EnumProperty(
-        name="servers",
-        description="servers enum",
-        items=server_list_callback,
-        update=update_server_preset_interface,
-    )
 
     # Custom panel
     panel_category: bpy.props.StringProperty(
@@ -379,38 +444,28 @@ class SessionPrefs(bpy.types.AddonPreferences):
 
     def draw(self, context):
         layout = self.layout
-
         layout.row().prop(self, "category", expand=True)
 
+        if self.category == 'PREF':
+            grid = layout.column()
+
+            box = grid.box()
+            row = box.row()
+            # USER SETTINGS
+            split = row.split(factor=0.7, align=True)
+            split.prop(self, "username", text="User")
+            split.prop(self, "client_color", text="")
+
+            row = box.row()
+            row.label(text="Hide settings:")
+            row = box.row()
+            row.prop(self, "sidebar_advanced_shown", text="Hide “Advanced” settings in side pannel (Not in session)")
+            row = box.row()
+            row.prop(self, "sidebar_repository_shown", text="Hide “Repository” settings in side pannel (In session)")
+
         if self.category == 'CONFIG':
             grid = layout.column()
 
-            # USER INFORMATIONS
-            box = grid.box()
-            box.prop(
-                self, "conf_session_identity_expanded", text="User information",
-                icon=get_expanded_icon(self.conf_session_identity_expanded),
-                emboss=False)
-            if self.conf_session_identity_expanded:
-                box.row().prop(self, "username", text="name")
-                box.row().prop(self, "client_color", text="color")
-
-            # NETWORK SETTINGS
-            box = grid.box()
-            box.prop(
-                self, "conf_session_net_expanded", text="Networking",
-                icon=get_expanded_icon(self.conf_session_net_expanded),
-                emboss=False)
-
-            if self.conf_session_net_expanded:
-                box.row().prop(self, "ip", text="Address")
-                row = box.row()
-                row.label(text="Port:")
-                row.prop(self, "port", text="")
-                row = box.row()
-                row.label(text="Init the session from:")
-                row.prop(self, "init_method", text="")
-
             # HOST SETTINGS
             box = grid.box()
             box.prop(
@@ -418,9 +473,57 @@ class SessionPrefs(bpy.types.AddonPreferences):
                 icon=get_expanded_icon(self.conf_session_hosting_expanded),
                 emboss=False)
             if self.conf_session_hosting_expanded:
+                row = box.row()
+                row.prop(self, "host_port", text="Port: ")
                 row = box.row()
                 row.label(text="Init the session from:")
                 row.prop(self, "init_method", text="")
+                row = box.row()
+                col = row.column()
+                col.prop(self, "host_use_server_password", text="Server password:")
+                col = row.column()
+                col.enabled = True if self.host_use_server_password else False
+                col.prop(self, "host_server_password", text="")
+                row = box.row()
+                col = row.column()
+                col.prop(self, "host_use_admin_password", text="Admin password:")
+                col = row.column()
+                col.enabled = True if self.host_use_admin_password else False
+                col.prop(self, "host_admin_password", text="")
+
+            # NETWORKING
+            box = grid.box()
+            box.prop(
+                self, "conf_session_net_expanded", text="Network",
+                icon=get_expanded_icon(self.conf_session_net_expanded), 
+                emboss=False)
+            if self.conf_session_net_expanded:
+                row = box.row()
+                row.label(text="Timeout (ms):")
+                row.prop(self, "connection_timeout", text="")
+                row = box.row()
+                row.label(text="Server ping (ms):")
+                row.prop(self, "ping_timeout", text="")
+
+            # REPLICATION
+            box = grid.box()
+            box.prop(
+                self, "conf_session_rep_expanded", text="Replication",
+                icon=get_expanded_icon(self.conf_session_rep_expanded), 
+                emboss=False)
+            if self.conf_session_rep_expanded:
+                row = box.row()
+                row.prop(self.sync_flags, "sync_render_settings")
+                row = box.row()
+                row.prop(self.sync_flags, "sync_active_camera")
+                row = box.row()
+                row.prop(self.sync_flags, "sync_during_editmode")
+                row = box.row()
+                if self.sync_flags.sync_during_editmode:
+                    warning = row.box()
+                    warning.label(text="Don't use this with heavy meshes !", icon='ERROR')
+                    row = box.row()
+                row.prop(self, "depsgraph_update_rate", text="Apply delay")
 
             # CACHE SETTINGS
             box = grid.box()
@@ -431,24 +534,18 @@ class SessionPrefs(bpy.types.AddonPreferences):
             if self.conf_session_cache_expanded:
                 box.row().prop(self, "cache_directory", text="Cache directory")
                 box.row().prop(self, "clear_memory_filecache", text="Clear memory filecache")
+                box.row().operator('session.clear_cache', text=f"Clear cache ({get_folder_size(self.cache_directory)})")
         
-            # INTERFACE SETTINGS
+            # LOGGING
             box = grid.box()
             box.prop(
-                self, "conf_session_ui_expanded", text="Interface",
+                self, "conf_session_log_expanded", text="Logging",
-                icon=get_expanded_icon(self.conf_session_ui_expanded),
+                icon=get_expanded_icon(self.conf_session_log_expanded), 
                 emboss=False)
-            if self.conf_session_ui_expanded:
+            if self.conf_session_log_expanded:
-                box.row().prop(self, "panel_category", text="Panel category", expand=True)
                 row = box.row()
-                row.label(text="Session widget:")
+                row.label(text="Log level:")
-
+                row.prop(self, 'logging_level', text="")
-                col = box.column(align=True)
-                col.prop(self, "presence_hud_scale", expand=True)
-                
-
-                col.prop(self, "presence_hud_hpos", expand=True)
-                col.prop(self, "presence_hud_vpos", expand=True)
 
         if self.category == 'UPDATE':
             from . import addon_updater_ops
@@ -469,18 +566,31 @@ class SessionPrefs(bpy.types.AddonPreferences):
             new_db.icon = impl.bl_icon
             new_db.bl_name = impl.bl_id
 
+    # Get a server preset through its name
+    def get_server_preset(self, name):
+        existing_preset = None
 
-    # custom at launch server preset
+        for server_preset in self.server_preset : 
+            if server_preset.server_name == name :
+                existing_preset = server_preset
+
+        return existing_preset
+
+    # Custom at launch server preset
     def generate_default_presets(self): 
         for preset_name, preset_data in DEFAULT_PRESETS.items():
-            existing_preset = self.server_preset.get(preset_name)
+            existing_preset = self.get_server_preset(preset_name)
             if existing_preset :
                 continue
             new_server = self.server_preset.add()
-            new_server.name = preset_name
+            new_server.name = str(uuid4())
-            new_server.server_ip = preset_data.get('server_ip')
+            new_server.server_name = preset_data.get('server_name')
-            new_server.server_port = preset_data.get('server_port')
+            new_server.ip = preset_data.get('ip')
+            new_server.port = preset_data.get('port')
+            new_server.use_server_password = preset_data.get('use_server_password',False)
             new_server.server_password = preset_data.get('server_password',None)
+            new_server.use_admin_password = preset_data.get('use_admin_password',False)
+            new_server.admin_password = preset_data.get('admin_password',None)
 
 
 def client_list_callback(scene, context):
@@ -538,6 +648,11 @@ class SessionProps(bpy.types.PropertyGroup):
         description='Enable user overlay ',
         default=True,
     )
+    presence_show_mode: bpy.props.BoolProperty(
+        name="Show users current mode",
+        description='Enable user mode overlay ',
+        default=False,
+    )
     presence_show_far_user: bpy.props.BoolProperty(
         name="Show users on different scenes",
         description="Show user on different scenes",
@@ -563,11 +678,6 @@ class SessionProps(bpy.types.PropertyGroup):
         description='Connect as admin',
         default=False
     )
-    internet_ip: bpy.props.StringProperty(
-        name="internet ip",
-        default="no found",
-        description='Internet interface ip',
-    )
     user_snap_running: bpy.props.BoolProperty(
         default=False
     )

multi_user/presence.py

@@ -94,15 +94,41 @@ 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, radius: float) -> 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 radius: bounding box radius
+        :param index: indice offset
-        :type radius: float
+        :type index: int 
-        :return: list of 8 points [(x,y,z),...]
+        :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+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
+    elif obj.type == 'LIGHT':
+        radius = obj.data.shadow_soft_size
+    elif obj.type == 'LIGHT_PROBE':
+        radius = obj.data.influence_distance
+    elif obj.type == 'CAMERA':
+        radius = obj.data.display_size
+    elif hasattr(obj, 'bound_box'):
+        vertex_indices = (
+            (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
+
     coords = [
         (-radius, -radius, -radius), (+radius, -radius, -radius),
         (-radius, +radius, -radius), (+radius, +radius, -radius),
@@ -112,9 +138,32 @@ def bbox_from_obj(obj: bpy.types.Object, radius: float) -> list:
     base = obj.matrix_world
     bbox_corners = [base @ mathutils.Vector(corner) for corner in coords]
 
-    return [(point.x, point.y, point.z)
+    vertex_pos = [(point.x, point.y, point.z) for point in bbox_corners]
-            for point in bbox_corners]
 
+    return vertex_pos, vertex_indices
+
+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 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, index=index+obj_index)
+        vertex_pos += vertex_pos_temp
+        vertex_indices += vertex_indices_temp
+
+    bbox_corners = [ic.matrix_world @ mathutils.Vector(vertex) for vertex in vertex_pos]
+
+    vertex_pos = [(point.x, point.y, point.z) for point in bbox_corners]
+
+    return vertex_pos, vertex_indices
 
 def generate_user_camera() -> list:
     """ Generate a basic camera represention of the user point of view
@@ -203,6 +252,13 @@ class Widget(object):
         """
         return True
 
+    def configure_bgl(self):
+        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
         """
@@ -256,11 +312,6 @@ class UserFrustumWidget(Widget):
             {"pos": positions},
             indices=self.indices)
 
-        bgl.glLineWidth(2.)
-        bgl.glEnable(bgl.GL_DEPTH_TEST)
-        bgl.glEnable(bgl.GL_BLEND)
-        bgl.glEnable(bgl.GL_LINE_SMOOTH)
-
         shader.bind()
         shader.uniform_float("color", self.data.get('color'))
         batch.draw(shader)
@@ -272,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):
@@ -281,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
@@ -295,50 +357,32 @@ class UserSelectionWidget(Widget):
             self.settings.enable_presence
 
     def draw(self):
-        user_selection = self.data.get('selected_objects')
+        vertex_pos = []
-        for select_ob in user_selection:
+        vertex_ind = []
-            ob = find_from_attr("uuid", select_ob, bpy.data.objects)
+        collection_offset = 0
-            if not ob:
+        for obj_index, obj in enumerate(self.selected_objects):
-                return
+            if obj is None:
-
+                continue
-            vertex_pos = bbox_from_obj(ob, 1.0)
+            obj_index+=collection_offset
-            vertex_indices = (
+            if hasattr(obj, 'instance_collection') and obj.instance_collection:
-                    (0, 1), (1, 2), (2, 3), (0, 3),
+                bbox_pos, bbox_ind = bbox_from_instance_collection(obj, index=obj_index)
-                    (4, 5), (5, 6), (6, 7), (4, 7),
+                collection_offset+=len(obj.instance_collection.objects)-1
-                    (0, 4), (1, 5), (2, 6), (3, 7))
+            else :
-
+                bbox_pos, bbox_ind = bbox_from_obj(obj, index=obj_index)
-            if ob.instance_collection:
+            vertex_pos += bbox_pos
-                for obj in ob.instance_collection.objects:
+            vertex_ind += bbox_ind
-                    if obj.type == 'MESH' and  hasattr(obj, 'bound_box'):
-                        vertex_pos = get_bb_coords_from_obj(obj, instance=ob)
-                        break
-            elif ob.type == 'EMPTY':
-                vertex_pos = bbox_from_obj(ob, ob.empty_display_size)
-            elif ob.type == 'LIGHT':
-                vertex_pos = bbox_from_obj(ob, ob.data.shadow_soft_size)
-            elif ob.type == 'LIGHT_PROBE':
-                vertex_pos = bbox_from_obj(ob, ob.data.influence_distance)
-            elif ob.type == 'CAMERA':
-                vertex_pos = bbox_from_obj(ob, ob.data.display_size)
-            elif hasattr(ob, '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))
-                vertex_pos = get_bb_coords_from_obj(ob)
 
         shader = gpu.shader.from_builtin('3D_UNIFORM_COLOR')
         batch = batch_for_shader(
             shader,
             'LINES',
             {"pos": vertex_pos},
-                indices=vertex_indices)
+            indices=vertex_ind)
 
         shader.bind()
         shader.uniform_float("color", self.data.get('color'))
         batch.draw(shader)
 
-
 class UserNameWidget(Widget):
     draw_type = 'POST_PIXEL'
 
@@ -381,6 +425,62 @@ class UserNameWidget(Widget):
             blf.color(0, color[0], color[1], color[2], color[3])
             blf.draw(0,  self.username)
 
+class UserModeWidget(Widget):
+    draw_type = 'POST_PIXEL'
+    
+    def __init__(
+            self,
+            username):
+        self.username = username
+        self.settings = bpy.context.window_manager.session
+        self.preferences = get_preferences()
+
+    @property
+    def data(self):
+        user = session.online_users.get(self.username)
+        if user:
+            return user.get('metadata')
+        else:
+            return None
+
+    def poll(self):
+        if self.data is None:
+            return False
+
+        scene_current = self.data.get('scene_current')
+        mode_current = self.data.get('mode_current')
+        user_selection = self.data.get('selected_objects')
+
+        return (scene_current == bpy.context.scene.name or
+                mode_current == bpy.context.mode or
+                self.settings.presence_show_far_user) and \
+            user_selection and \
+            self.settings.presence_show_mode and \
+            self.settings.enable_presence
+
+    def draw(self):
+        user_selection = self.data.get('selected_objects')
+        area, region, rv3d = view3d_find()
+        viewport_coord = project_to_viewport(region, rv3d, (0, 0))
+            
+        obj = find_from_attr("uuid", user_selection[0], bpy.data.objects)
+        if not obj:
+            return
+        mode_current = self.data.get('mode_current')      
+        color = self.data.get('color')
+        origin_coord = project_to_screen(obj.location)
+
+        distance_viewport_object = math.sqrt((viewport_coord[0]-obj.location[0])**2+(viewport_coord[1]-obj.location[1])**2+(viewport_coord[2]-obj.location[2])**2)
+
+        if distance_viewport_object > self.preferences.presence_mode_distance :
+            return
+
+        if origin_coord :
+            blf.position(0, origin_coord[0]+8, origin_coord[1]-15, 0)
+            blf.size(0, 16, 72)
+            blf.color(0, color[0], color[1], color[2], color[3])
+            blf.draw(0,  mode_current)        
+
 
 class SessionStatusWidget(Widget):
     draw_type = 'POST_PIXEL'
@@ -463,6 +563,7 @@ class DrawFactory(object):
         try:
             for widget in self.widgets.values():
                 if widget.draw_type == 'POST_VIEW' and widget.poll():
+                    widget.configure_bgl()
                     widget.draw()
         except Exception as e:
             logging.error(
@@ -472,6 +573,7 @@ class DrawFactory(object):
         try:
             for widget in self.widgets.values():
                 if widget.draw_type == 'POST_PIXEL' and widget.poll():
+                    widget.configure_bgl()
                     widget.draw()
         except Exception as e:
             logging.error(
@@ -485,6 +587,7 @@ this.renderer = DrawFactory()
 def register():
     this.renderer.register_handlers()
     
+
     this.renderer.add_widget("session_status", SessionStatusWidget())
 
 

multi_user/shared_data.py

@@ -0,0 +1,48 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+from replication.constants import STATE_INITIAL
+
+
+class SessionData():
+    """ A structure to share easily the current session data across the addon
+        modules.
+        This object will completely replace the Singleton lying in replication
+        interface module.  
+    """
+
+    def __init__(self):
+        self.repository = None  # The current repository
+        self.remote = None  # The active remote
+        self.server = None
+        self.applied_updates = []
+
+    @property
+    def state(self):
+        if self.remote is None:
+            return STATE_INITIAL
+        else:
+            return self.remote.connection_status
+
+    def clear(self):
+        self.remote = None
+        self.repository = None
+        self.server = None
+        self.applied_updates = []
+
+
+session = SessionData()

multi_user/timers.py

@@ -27,10 +27,12 @@ from replication.interface import session
 from replication import porcelain
 
 from . import operators, utils
-from .presence import (UserFrustumWidget, UserNameWidget, UserSelectionWidget,
+from .presence import (UserFrustumWidget, UserNameWidget, UserModeWidget, UserSelectionWidget,
                        generate_user_camera, get_view_matrix, refresh_3d_view,
                        refresh_sidebar_view, renderer)
 
+from . import shared_data 
+
 this = sys.modules[__name__]
 
 # Registered timers
@@ -39,7 +41,8 @@ this.registry = dict()
 def is_annotating(context: bpy.types.Context):
     """ Check if the annotate mode is enabled
     """
-    return bpy.context.workspace.tools.from_space_view3d_mode('OBJECT', create=False).idname == 'builtin.annotate'
+    active_tool = bpy.context.workspace.tools.from_space_view3d_mode('OBJECT', create=False)
+    return (active_tool and active_tool.idname == 'builtin.annotate')
 
 
 class Timer(object):
@@ -114,6 +117,7 @@ class ApplyTimer(Timer):
 
                 if node_ref.state == FETCHED:
                     try:
+                        shared_data.session.applied_updates.append(node)
                         porcelain.apply(session.repository, node)
                     except Exception as e:
                         logging.error(f"Fail to apply {node_ref.uuid}")
@@ -126,24 +130,22 @@ class ApplyTimer(Timer):
                                 porcelain.apply(session.repository,
                                       parent.uuid,
                                       force=True)
+                        if hasattr(impl, 'bl_reload_child') and impl.bl_reload_child:
+                            for dep in node_ref.dependencies:
+                                porcelain.apply(session.repository,
+                                                dep,
+                                                force=True)
 
 
-class DynamicRightSelectTimer(Timer):
+class AnnotationUpdates(Timer):
-    def __init__(self, timeout=.1):
+    def __init__(self, timeout=1):
-        super().__init__(timeout)
-        self._last_selection = []
-        self._user = None
         self._annotating = False
+        self._settings = utils.get_preferences()
+
+        super().__init__(timeout)
 
     def execute(self):
-        settings = utils.get_preferences()
-
         if session and session.state == STATE_ACTIVE:
-            # Find user
-            if self._user is None:
-                self._user = session.online_users.get(settings.username)
-
-            if self._user:
             ctx = bpy.context
             annotation_gp = ctx.scene.grease_pencil
 
@@ -160,67 +162,76 @@ class DynamicRightSelectTimer(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)
 
-                        if registered_gp.owner == settings.username:
+                    if registered_gp.owner == self._settings.username:
-                            gp_node = session.repository.graph.get(annotation_gp.uuid)
+                        porcelain.commit(session.repository, annotation_gp.uuid)
-                            porcelain.commit(session.repository, gp_node.uuid)
+                        porcelain.push(session.repository, 'origin', annotation_gp.uuid)
-                            porcelain.push(session.repository, 'origin', gp_node.uuid)
 
                 elif self._annotating:
                     porcelain.unlock(session.repository,
-                                        registered_gp.uuid,
+                                    [registered_gp.uuid],
                                     ignore_warnings=True,
                                     affect_dependencies=False)
+                    self._annotating = False
 
-                current_selection = utils.get_selected_objects(
+class DynamicRightSelectTimer(Timer):
+    def __init__(self, timeout=.1):
+        super().__init__(timeout)
+        self._last_selection = set()
+        self._user = None
+
+    def execute(self):
+        settings = utils.get_preferences()
+
+        if session and session.state == STATE_ACTIVE:
+            # Find user
+            if self._user is None:
+                self._user = session.online_users.get(settings.username)
+
+            if self._user:
+                current_selection = set(utils.get_selected_objects(
                     bpy.context.scene,
                     bpy.data.window_managers['WinMan'].windows[0].view_layer
-                )
+                ))
                 if current_selection != self._last_selection:
-                    obj_common = [
+                    to_lock = list(current_selection.difference(self._last_selection))
-                        o for o in self._last_selection if o not in current_selection]
+                    to_release = list(self._last_selection.difference(current_selection))
-                    obj_ours = [
+                    instances_to_lock = list()
-                        o for o in current_selection if o not in self._last_selection]
-
-                    # change old selection right to common
-                    for obj in obj_common:
-                        node = session.repository.graph.get(obj)
-
-                        if node and (node.owner == settings.username or node.owner == RP_COMMON):
-                            recursive = True
-                            if node.data and 'instance_type' in node.data.keys():
-                                recursive = node.data['instance_type'] != 'COLLECTION'
-                            try:
-                                porcelain.unlock(session.repository,
-                                                node.uuid,
-                                                ignore_warnings=True,
-                                                affect_dependencies=recursive)
-                            except NonAuthorizedOperationError:
-                                logging.warning(
-                                    f"Not authorized to change {node} owner")
-
-                    # change new selection to our
-                    for obj in obj_ours:
-                        node = session.repository.graph.get(obj)
-
-                        if node and node.owner == RP_COMMON:
-                            recursive = True
-                            if node.data and 'instance_type' in node.data.keys():
-                                recursive = node.data['instance_type'] != 'COLLECTION'
 
+                    for node_id in to_lock:
+                        node = session.repository.graph.get(node_id)
+                        instance_mode = node.data.get('instance_type')
+                        if instance_mode and instance_mode == 'COLLECTION':
+                            to_lock.remove(node_id)
+                            instances_to_lock.append(node_id)
+                    if instances_to_lock:
                         try:
                             porcelain.lock(session.repository,
-                                               node.uuid,
+                                            instances_to_lock,
                                             ignore_warnings=True,
-                                               affect_dependencies=recursive)
+                                            affect_dependencies=False)
-                            except NonAuthorizedOperationError:
+                        except NonAuthorizedOperationError as e:
-                                logging.warning(
+                            logging.warning(e)
-                                    f"Not authorized to change {node} owner")
+
-                        else:
+                    if to_release:
-                            return
+                        try:
+                            porcelain.unlock(session.repository,
+                                            to_release,
+                                            ignore_warnings=True,
+                                            affect_dependencies=True)
+                        except NonAuthorizedOperationError as e:
+                            logging.warning(e)
+                    if to_lock:
+                        try:
+                            porcelain.lock(session.repository,
+                                            to_lock,
+                                            ignore_warnings=True,
+                                            affect_dependencies=True)
+                        except NonAuthorizedOperationError as e:
+                            logging.warning(e)
 
                     self._last_selection = current_selection
 
@@ -234,23 +245,23 @@ class DynamicRightSelectTimer(Timer):
                     # Fix deselection until right managment refactoring (with Roles concepts)
                     if len(current_selection) == 0 :
                         owned_keys = [k for k, v in session.repository.graph.items() if v.owner==settings.username]
-                        for key in owned_keys:
+                        if owned_keys:
-                            node = session.repository.graph.get(key)
                             try:
                                 porcelain.unlock(session.repository,
-                                                key,
+                                                owned_keys,
                                                 ignore_warnings=True,
                                                 affect_dependencies=True)
-                            except NonAuthorizedOperationError:
+                            except NonAuthorizedOperationError as e:
-                                logging.warning(
+                                logging.warning(e)
-                                    f"Not authorized to change {key} owner")
 
+            # Objects selectability
             for obj in bpy.data.objects:
                 object_uuid = getattr(obj, 'uuid', None)
                 if object_uuid:
                     is_selectable = not session.repository.is_node_readonly(object_uuid)
                     if obj.hide_select != is_selectable:
                         obj.hide_select = is_selectable
+                        shared_data.session.applied_updates.append(object_uuid)
 
 
 class ClientUpdate(Timer):
@@ -300,7 +311,8 @@ class ClientUpdate(Timer):
                                   settings.client_color.b,
                                   1),
                         'frame_current': bpy.context.scene.frame_current,
-                        'scene_current': scene_current
+                        'scene_current': scene_current,
+                        'mode_current': bpy.context.mode
                     }
                     porcelain.update_user_metadata(session.repository, metadata)
 
@@ -314,6 +326,9 @@ class ClientUpdate(Timer):
                     local_user_metadata['view_matrix'] = get_view_matrix(
                     )
                     porcelain.update_user_metadata(session.repository, local_user_metadata)
+                elif bpy.context.mode != local_user_metadata['mode_current']:
+                    local_user_metadata['mode_current'] = bpy.context.mode
+                    porcelain.update_user_metadata(session.repository, local_user_metadata)
 
 
 class SessionStatusUpdate(Timer):
@@ -341,6 +356,7 @@ class SessionUserSync(Timer):
                     renderer.remove_widget(f"{user.username}_cam")
                     renderer.remove_widget(f"{user.username}_select")
                     renderer.remove_widget(f"{user.username}_name")
+                    renderer.remove_widget(f"{user.username}_mode")
                     ui_users.remove(index)
                     break
 
@@ -356,6 +372,8 @@ class SessionUserSync(Timer):
                             f"{user}_select", UserSelectionWidget(user))
                         renderer.add_widget(
                             f"{user}_name", UserNameWidget(user))
+                        renderer.add_widget(
+                            f"{user}_mode", UserModeWidget(user))
 
 
 class MainThreadExecutor(Timer):

multi_user/ui.py

@@ -16,7 +16,9 @@
 # ##### END GPL LICENSE BLOCK #####
 
 
+from logging import log
 import bpy
+import bpy.utils.previews
 
 from .utils import get_preferences, get_expanded_icon, get_folder_size, get_state_str
 from replication.constants import (ADDED, ERROR, FETCHED,
@@ -71,162 +73,132 @@ class SESSION_PT_settings(bpy.types.Panel):
 
     def draw_header(self, context):
         layout = self.layout
+        settings = get_preferences()
+
+        from multi_user import icons
+        offline_icon = icons.icons_col["session_status_offline"]
+        waiting_icon = icons.icons_col["session_status_waiting"]
+        online_icon = icons.icons_col["session_status_online"]
+
         if session and session.state != STATE_INITIAL:
             cli_state = session.state
             state =  session.state
-            connection_icon = "KEYTYPE_MOVING_HOLD_VEC"
+            connection_icon = offline_icon
 
             if state == STATE_ACTIVE:
-                connection_icon = 'PROP_ON'
+                connection_icon = online_icon
             else:
-                connection_icon = 'PROP_CON'
+                connection_icon = waiting_icon
 
-            layout.label(text=f"Session - {get_state_str(cli_state)}", icon=connection_icon)
+            layout.label(text=f"{str(settings.server_name)} - {get_state_str(cli_state)}", icon_value=connection_icon.icon_id)
         else:
-            layout.label(text=f"Session - v{__version__}",icon="PROP_OFF")
+            layout.label(text=f"Multi-user - v{__version__}", icon="ANTIALIASED")
 
     def draw(self, context):
         layout = self.layout
-        row = layout.row()
         runtime_settings = context.window_manager.session
         settings = get_preferences()
 
+        if settings.is_first_launch:
+            # USER SETTINGS
+            row = layout.row()
+            row.label(text="1. Enter your username and color:")
+            row = layout.row()
+            split = row.split(factor=0.7, align=True)
+            split.prop(settings, "username", text="")
+            split.prop(settings, "client_color", text="")
+
+            # DOC
+            row = layout.row()
+            row.label(text="2. New here ? See the doc:")
+            row = layout.row()
+            row.operator("doc.get", text="Documentation", icon="HELP")
+        
+            # START
+            row = layout.row()
+            row.label(text="3: Start the Multi-user:")
+            row = layout.row()
+            row.scale_y = 2
+            row.operator("firstlaunch.verify", text="Continue")
+        
+        if not settings.is_first_launch:
             if hasattr(context.window_manager, 'session'):
                 # STATE INITIAL
                 if not session \
                 or (session and session.state == STATE_INITIAL):
-                pass
+                    layout = self.layout
-            else:
+                    settings = get_preferences()
-                progress = session.state_progress           
+                    server_preset = settings.server_preset
-                row = layout.row()
+                    selected_server = context.window_manager.server_index if context.window_manager.server_index<=len(server_preset)-1 else 0
+                    active_server_name = server_preset[selected_server].name if len(server_preset)>=1 else ""
+                    is_server_selected = True if active_server_name else False
 
+                    # SERVER LIST
+                    row = layout.row()
+                    box = row.box()
+                    box.scale_y = 0.7
+                    split = box.split(factor=0.7)
+                    split.label(text="Server")
+                    split.label(text="Online")
+
+                    col = row.column(align=True)
+                    col.operator("session.get_info", icon="FILE_REFRESH", text="")
+
+                    row = layout.row()
+                    col = row.column(align=True)
+                    col.template_list("SESSION_UL_network",  "",  settings, "server_preset", context.window_manager, "server_index")
+                    col.separator()
+                    connectOp = col.row()
+                    connectOp.enabled =is_server_selected
+                    connectOp.operator("session.connect", text="Connect")
+
+                    col = row.column(align=True)
+                    col.operator("session.preset_server_add", icon="ADD", text="") # TODO : add conditions (need a name, etc..)
+                    row_visible = col.row(align=True)
+                    col_visible = row_visible.column(align=True)
+                    col_visible.enabled = is_server_selected
+                    col_visible.operator("session.preset_server_remove", icon="REMOVE", text="").target_server_name = active_server_name
+                    col_visible.separator()
+                    col_visible.operator("session.preset_server_edit", icon="GREASEPENCIL", text="").target_server_name = active_server_name
+
+                else:
+                    exitbutton = layout.row()
+                    exitbutton.scale_y = 1.5
+                    exitbutton.operator("session.stop", icon='QUIT', text="Disconnect")
+
+                    progress = session.state_progress
                     current_state = session.state
                     info_msg = None
                     
-                if current_state in [STATE_ACTIVE]:
-                    row = row.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=True)
-                    row.prop(settings.sync_flags, "sync_render_settings",text="",icon_only=True, icon='SCENE')
-                    row.prop(settings.sync_flags, "sync_during_editmode", text="",icon_only=True, icon='EDITMODE_HLT')
-                    row.prop(settings.sync_flags, "sync_active_camera", text="",icon_only=True, icon='OBJECT_DATAMODE')
-
-                row= layout.row()
-
-                if current_state in [STATE_ACTIVE] and runtime_settings.is_host:
-                    info_msg = f"LAN: {runtime_settings.internet_ip}" 
                     if current_state == STATE_LOBBY:
+                        usr = session.online_users.get(settings.username)
+                        row= layout.row()
                         info_msg = "Waiting for the session to start."
-
+                        if usr and usr['admin']:
-                if info_msg:
+                            info_msg = "Init the session to start."
-                    info_box = row.box()
+                            info_box = layout.row()
+                            info_box.label(text=info_msg,icon='INFO')
+                            init_row = layout.row()
+                            init_row.operator("session.init", icon='TOOL_SETTINGS', text="Init")
+                        else:
+                            info_box = layout.row()
                             info_box.row().label(text=info_msg,icon='INFO')
 
-                # Progress bar
+                    # PROGRESS BAR
                     if current_state in [STATE_SYNCING, STATE_SRV_SYNC, STATE_WAITING]:
+                        row= layout.row()
+                        row.label(text=f"Status: {get_state_str(current_state)}")
+                        row= layout.row()
                         info_box = row.box()
-                    info_box.row().label(text=printProgressBar(
+                        info_box.label(text=printProgressBar(
                             progress['current'],
                             progress['total'],
                             length=16
                         ))
 
-                layout.row().operator("session.stop", icon='QUIT', text="Exit")
+class SESSION_PT_host_settings(bpy.types.Panel):
-
+    bl_idname = "MULTIUSER_SETTINGS_HOST_PT_panel"
-class SESSION_PT_settings_network(bpy.types.Panel):
+    bl_label = "Hosting"
-    bl_idname = "MULTIUSER_SETTINGS_NETWORK_PT_panel"
-    bl_label = "Network"
-    bl_space_type = 'VIEW_3D'
-    bl_region_type = 'UI'
-    bl_parent_id = 'MULTIUSER_SETTINGS_PT_panel'
-
-    @classmethod
-    def poll(cls, context):
-        return not session \
-            or (session and session.state == 0)
-
-    def draw_header(self, context):
-        self.layout.label(text="", icon='URL')
-
-    def draw(self, context):
-        layout = self.layout
-
-        runtime_settings = context.window_manager.session
-        settings = get_preferences()
-
-        # USER SETTINGS
-        row = layout.row()
-        row.prop(runtime_settings, "session_mode", expand=True)
-        row = layout.row()
-                     
-        col = row.row(align=True)
-        col.prop(settings, "server_preset_interface", text="")
-        col.operator("session.preset_server_add", icon='ADD', text="")
-        col.operator("session.preset_server_remove", icon='REMOVE', text="")
-
-        row = layout.row()
-        box = row.box()
-
-        if runtime_settings.session_mode == 'HOST':
-            row = box.row()
-            row.label(text="Port:")
-            row.prop(settings, "port", text="")
-            row = box.row()
-            row.label(text="Start from:")
-            row.prop(settings, "init_method", text="")
-            row = box.row()
-            row.label(text="Admin password:")
-            row.prop(settings, "password", text="")
-            row = box.row()
-            row.operator("session.start", text="HOST").host = True
-        else:
-            row = box.row()
-            row.prop(settings, "ip", text="IP")
-            row = box.row()
-            row.label(text="Port:")
-            row.prop(settings, "port", text="")
-
-            row = box.row()
-            row.prop(runtime_settings, "admin", text='Connect as admin', icon='DISCLOSURE_TRI_DOWN' if runtime_settings.admin
-                     else 'DISCLOSURE_TRI_RIGHT')
-            if runtime_settings.admin:
-                row = box.row()
-                row.label(text="Password:")
-                row.prop(settings, "password", text="")
-            row = box.row()
-            row.operator("session.start", text="CONNECT").host = False
-
-class SESSION_PT_settings_user(bpy.types.Panel):
-    bl_idname = "MULTIUSER_SETTINGS_USER_PT_panel"
-    bl_label = "User info"
-    bl_space_type = 'VIEW_3D'
-    bl_region_type = 'UI'
-    bl_parent_id = 'MULTIUSER_SETTINGS_PT_panel'
-
-    @classmethod
-    def poll(cls, context):
-        return not session \
-            or (session and session.state == 0)
-    
-    def draw_header(self, context):
-        self.layout.label(text="", icon='USER')
-
-    def draw(self, context):
-        layout = self.layout
-
-        runtime_settings = context.window_manager.session
-        settings = get_preferences()
-
-        row = layout.row()
-        # USER SETTINGS
-        row.prop(settings, "username", text="name")
-
-        row = layout.row()
-        row.prop(settings, "client_color", text="color")
-        row = layout.row()
-
-
-class SESSION_PT_advanced_settings(bpy.types.Panel):
-    bl_idname = "MULTIUSER_SETTINGS_REPLICATION_PT_panel"
-    bl_label = "Advanced"
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'UI'
     bl_parent_id = 'MULTIUSER_SETTINGS_PT_panel'
@@ -234,19 +206,82 @@ class SESSION_PT_advanced_settings(bpy.types.Panel):
 
     @classmethod
     def poll(cls, context):
+        settings = get_preferences()
         return not session \
-            or (session and session.state == 0)
+            or (session and session.state == 0) \
+            and not settings.sidebar_advanced_shown \
+            and not settings.is_first_launch
+
+    def draw_header(self, context):
+        self.layout.label(text="", icon='NETWORK_DRIVE')
+        
+    def draw(self, context):
+        layout = self.layout
+        settings = get_preferences()
+
+        #HOST
+        host_selection = layout.row().box()
+        host_selection_row = host_selection.row()
+        host_selection_row.label(text="Init the session from:")
+        host_selection_row.prop(settings, "init_method", text="")
+        host_selection_row = host_selection.row()
+        host_selection_row.label(text="Port:")
+        host_selection_row.prop(settings, "host_port", text="")
+        host_selection_row = host_selection.row()
+        host_selection_col = host_selection_row.column()
+        host_selection_col.prop(settings, "host_use_server_password", text="Server password:")
+        host_selection_col = host_selection_row.column()
+        host_selection_col.enabled = True if settings.host_use_server_password else False
+        host_selection_col.prop(settings, "host_server_password", text="")
+        host_selection_row = host_selection.row()
+        host_selection_col = host_selection_row.column()
+        host_selection_col.prop(settings, "host_use_admin_password", text="Admin password:")
+        host_selection_col = host_selection_row.column()
+        host_selection_col.enabled = True if settings.host_use_admin_password else False
+        host_selection_col.prop(settings, "host_admin_password", text="")
+
+        host_selection = layout.column()
+        host_selection.operator("session.host", text="Host")
+
+
+class SESSION_PT_advanced_settings(bpy.types.Panel):
+    bl_idname = "MULTIUSER_SETTINGS_REPLICATION_PT_panel"
+    bl_label = "General Settings"
+    bl_space_type = 'VIEW_3D'
+    bl_region_type = 'UI'
+    bl_parent_id = 'MULTIUSER_SETTINGS_PT_panel'
+    bl_options = {'DEFAULT_CLOSED'}
+
+    @classmethod
+    def poll(cls, context):
+        settings = get_preferences()
+        return not session \
+            or (session and session.state == 0) \
+            and not settings.sidebar_advanced_shown \
+            and not settings.is_first_launch
 
     def draw_header(self, context):
         self.layout.label(text="", icon='PREFERENCES')
         
     def draw(self, context):
         layout = self.layout
-
-        runtime_settings = context.window_manager.session
         settings = get_preferences()
 
+        #ADVANCED USER INFO
+        uinfo_section = layout.row().box()
+        uinfo_section.prop(
+            settings,
+            "sidebar_advanced_uinfo_expanded",
+            text="User Info",
+            icon=get_expanded_icon(settings.sidebar_advanced_uinfo_expanded), 
+            emboss=False)
+        if settings.sidebar_advanced_uinfo_expanded:
+            uinfo_section_row = uinfo_section.row()
+            uinfo_section_split = uinfo_section_row.split(factor=0.7, align=True)
+            uinfo_section_split.prop(settings, "username", text="")
+            uinfo_section_split.prop(settings, "client_color", text="")
 
+        #ADVANCED NET
         net_section = layout.row().box()
         net_section.prop(
             settings,
@@ -254,12 +289,15 @@ class SESSION_PT_advanced_settings(bpy.types.Panel):
             text="Network",
             icon=get_expanded_icon(settings.sidebar_advanced_net_expanded), 
             emboss=False)
-        
         if settings.sidebar_advanced_net_expanded:
             net_section_row = net_section.row()
             net_section_row.label(text="Timeout (ms):")
             net_section_row.prop(settings, "connection_timeout", text="")
+            net_section_row = net_section.row()
+            net_section_row.label(text="Server ping (ms):")
+            net_section_row.prop(settings, "ping_timeout", text="")
 
+        #ADVANCED REPLICATION
         replication_section = layout.row().box()
         replication_section.prop(
             settings,
@@ -267,16 +305,12 @@ class SESSION_PT_advanced_settings(bpy.types.Panel):
             text="Replication",
             icon=get_expanded_icon(settings.sidebar_advanced_rep_expanded), 
             emboss=False)
-
         if settings.sidebar_advanced_rep_expanded:
-            replication_section_row = replication_section.row()
-
             replication_section_row = replication_section.row()
             replication_section_row.prop(settings.sync_flags, "sync_render_settings")
             replication_section_row = replication_section.row()
             replication_section_row.prop(settings.sync_flags, "sync_active_camera")
             replication_section_row = replication_section.row()
-
             replication_section_row.prop(settings.sync_flags, "sync_during_editmode")
             replication_section_row = replication_section.row()
             if settings.sync_flags.sync_during_editmode:
@@ -285,7 +319,7 @@ class SESSION_PT_advanced_settings(bpy.types.Panel):
                 replication_section_row = replication_section.row()
             replication_section_row.prop(settings, "depsgraph_update_rate", text="Apply delay")
 
-        
+        #ADVANCED CACHE
         cache_section = layout.row().box()
         cache_section.prop(
             settings,
@@ -303,6 +337,8 @@ class SESSION_PT_advanced_settings(bpy.types.Panel):
             cache_section_row.prop(settings, "clear_memory_filecache", text="")
             cache_section_row = cache_section.row()
             cache_section_row.operator('session.clear_cache', text=f"Clear cache ({get_folder_size(settings.cache_directory)})")
+        
+        #ADVANCED LOG
         log_section = layout.row().box()
         log_section.prop(
             settings,
@@ -310,11 +346,11 @@ class SESSION_PT_advanced_settings(bpy.types.Panel):
             text="Logging",
             icon=get_expanded_icon(settings.sidebar_advanced_log_expanded), 
             emboss=False)
-
         if settings.sidebar_advanced_log_expanded:
             log_section_row = log_section.row()
             log_section_row.label(text="Log level:")
             log_section_row.prop(settings, 'logging_level', text="")
+
 class SESSION_PT_user(bpy.types.Panel):
     bl_idname = "MULTIUSER_USER_PT_panel"
     bl_label = "Online users"
@@ -324,7 +360,8 @@ class SESSION_PT_user(bpy.types.Panel):
 
     @classmethod
     def poll(cls, context):
-        return session and session.state in [STATE_ACTIVE, STATE_LOBBY]
+        return session \
+            and session.state in [STATE_ACTIVE, STATE_LOBBY]
 
     def draw_header(self, context):
         self.layout.label(text="", icon='USER')
@@ -336,22 +373,23 @@ class SESSION_PT_user(bpy.types.Panel):
         settings = get_preferences()
         active_user = online_users[selected_user] if len(
             online_users)-1 >= selected_user else 0
-        runtime_settings = context.window_manager.session
 
-        # Create a simple row.
+        #USER LIST
         row = layout.row()
         box = row.box()
         split = box.split(factor=0.35)
         split.label(text="user")
-        split = split.split(factor=0.5)
+        split = split.split(factor=0.3)
-        split.label(text="location")
+        split.label(text="mode")
         split.label(text="frame")
+        split.label(text="location")
         split.label(text="ping")
 
         row = layout.row()
         layout.template_list("SESSION_UL_users",  "",  context.window_manager,
                              "online_users", context.window_manager,  "user_index")
 
+        #OPERATOR ON USER
         if active_user != 0 and active_user.username != settings.username:
             row = layout.row()
             user_operations = row.split()
@@ -383,6 +421,8 @@ class SESSION_UL_users(bpy.types.UIList):
         ping = '-'
         frame_current = '-'
         scene_current = '-'
+        mode_current = '-'
+        mode_icon = 'BLANK1'
         status_icon = 'BLANK1'
         if session:
             user = session.online_users.get(item.username)
@@ -392,57 +432,49 @@ class SESSION_UL_users(bpy.types.UIList):
                 if metadata and 'frame_current' in metadata:
                     frame_current = str(metadata.get('frame_current','-'))
                     scene_current = metadata.get('scene_current','-')
+                    mode_current = metadata.get('mode_current','-')
+                    if mode_current == "OBJECT" :
+                        mode_icon = "OBJECT_DATAMODE"
+                    elif mode_current == "EDIT_MESH" :
+                        mode_icon = "EDITMODE_HLT"
+                    elif mode_current == 'EDIT_CURVE':
+                        mode_icon = "CURVE_DATA"
+                    elif mode_current == 'EDIT_SURFACE':
+                        mode_icon = "SURFACE_DATA"
+                    elif mode_current == 'EDIT_TEXT':
+                        mode_icon = "FILE_FONT"
+                    elif mode_current == 'EDIT_ARMATURE':
+                        mode_icon = "ARMATURE_DATA"
+                    elif mode_current == 'EDIT_METABALL':
+                        mode_icon = "META_BALL"
+                    elif mode_current == 'EDIT_LATTICE':
+                        mode_icon = "LATTICE_DATA"
+                    elif mode_current == 'POSE':
+                        mode_icon = "POSE_HLT"
+                    elif mode_current == 'SCULPT':
+                        mode_icon = "SCULPTMODE_HLT"
+                    elif mode_current == 'PAINT_WEIGHT':
+                        mode_icon = "WPAINT_HLT"
+                    elif mode_current == 'PAINT_VERTEX':
+                        mode_icon = "VPAINT_HLT"
+                    elif mode_current == 'PAINT_TEXTURE':
+                        mode_icon = "TPAINT_HLT"
+                    elif mode_current == 'PARTICLE':
+                        mode_icon = "PARTICLES"
+                    elif mode_current == 'PAINT_GPENCIL' or mode_current =='EDIT_GPENCIL' or mode_current =='SCULPT_GPENCIL' or mode_current =='WEIGHT_GPENCIL' or mode_current =='VERTEX_GPENCIL':
+                        mode_icon = "GREASEPENCIL"
                 if user['admin']:
                     status_icon = 'FAKE_USER_ON'
         split = layout.split(factor=0.35)
         split.label(text=item.username, icon=status_icon)
-        split = split.split(factor=0.5)
+        split = split.split(factor=0.3)
-        split.label(text=scene_current)
+        split.label(icon=mode_icon)
         split.label(text=frame_current)
+        split.label(text=scene_current)
         split.label(text=ping)
 
-
-class SESSION_PT_presence(bpy.types.Panel):
-    bl_idname = "MULTIUSER_MODULE_PT_panel"
-    bl_label = "Presence overlay"
-    bl_space_type = 'VIEW_3D'
-    bl_region_type = 'UI'
-    bl_parent_id = 'MULTIUSER_SETTINGS_PT_panel'
-    bl_options = {'DEFAULT_CLOSED'}
-
-    @classmethod
-    def poll(cls, context):
-        return not session \
-            or (session and session.state in [STATE_INITIAL, STATE_ACTIVE])
-
-    def draw_header(self, context):
-        self.layout.prop(context.window_manager.session,
-                         "enable_presence", text="",icon='OVERLAY')
-
-    def draw(self, context):
-        layout = self.layout
-
-        settings = context.window_manager.session
-        pref = get_preferences()
-        layout.active = settings.enable_presence
-        col = layout.column()
-        col.prop(settings, "presence_show_session_status")
-        row = col.column()
-        row.active = settings.presence_show_session_status
-        row.prop(pref, "presence_hud_scale", expand=True)
-        row = col.column(align=True)
-        row.active = settings.presence_show_session_status
-        row.prop(pref, "presence_hud_hpos", expand=True)
-        row.prop(pref, "presence_hud_vpos", expand=True)
-        col.prop(settings, "presence_show_selected")
-        col.prop(settings, "presence_show_user")
-        row = layout.column()
-        row.active = settings.presence_show_user
-        row.prop(settings, "presence_show_far_user")
-
 def draw_property(context, parent, property_uuid, level=0):
     settings = get_preferences()
-    runtime_settings = context.window_manager.session
     item = session.repository.graph.get(property_uuid)
     type_id = item.data.get('type_id')
     area_msg = parent.row(align=True)
@@ -462,15 +494,18 @@ def draw_property(context, parent, property_uuid, level=0):
     detail_item_box.label(text=f"{name}")
 
     # Operations
-
     have_right_to_modify = (item.owner == settings.username or \
         item.owner == RP_COMMON) and item.state != ERROR
 
+    from multi_user import icons
+    sync_status = icons.icons_col["repository_push"] #TODO: Link all icons to the right sync (push/merge/issue). For issue use "UNLINKED" for icon
+    # sync_status = icons.icons_col["repository_merge"]
+
     if have_right_to_modify:
         detail_item_box.operator(
             "session.commit",
             text="",
-            icon='TRIA_UP').target = item.uuid
+            icon_value=sync_status.icon_id).target = item.uuid
         detail_item_box.separator()
 
     if item.state in [FETCHED, UP]:
@@ -502,12 +537,40 @@ def draw_property(context, parent, property_uuid, level=0):
     else:
         detail_item_box.label(text="", icon="DECORATE_LOCKED")
 
+class SESSION_PT_sync(bpy.types.Panel):
+    bl_idname = "MULTIUSER_SYNC_PT_panel"
+    bl_label = "Synchronize"
+    bl_space_type = 'VIEW_3D'
+    bl_region_type = 'UI'
+    bl_parent_id = 'MULTIUSER_SETTINGS_PT_panel'
+    bl_options = {'DEFAULT_CLOSED'}
+
+    @classmethod
+    def poll(cls, context):
+        return session \
+            and session.state in [STATE_ACTIVE]
+
+    def draw_header(self, context):
+        self.layout.label(text="", icon='UV_SYNC_SELECT')
+
+    def draw(self, context):
+        layout = self.layout
+        settings = get_preferences()
+
+        row= layout.row()
+        row = row.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=True)
+        row.prop(settings.sync_flags, "sync_render_settings",text="",icon_only=True, icon='SCENE')
+        row.prop(settings.sync_flags, "sync_during_editmode", text="",icon_only=True, icon='EDITMODE_HLT')
+        row.prop(settings.sync_flags, "sync_active_camera", text="",icon_only=True, icon='VIEW_CAMERA')
+
+
 class SESSION_PT_repository(bpy.types.Panel):
     bl_idname = "MULTIUSER_PROPERTIES_PT_panel"
     bl_label = "Repository"
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'UI'
     bl_parent_id = 'MULTIUSER_SETTINGS_PT_panel'
+    bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
     def poll(cls, context):
@@ -520,8 +583,8 @@ class SESSION_PT_repository(bpy.types.Panel):
                 admin = usr['admin']
         return hasattr(context.window_manager, 'session') and \
             session and \
-            (session.state == STATE_ACTIVE or \
+            session.state == STATE_ACTIVE and \
-            session.state == STATE_LOBBY and admin)
+            not settings.sidebar_repository_shown
 
     def draw_header(self, context):
         self.layout.label(text="", icon='OUTLINER_OB_GROUP_INSTANCE')
@@ -535,19 +598,18 @@ class SESSION_PT_repository(bpy.types.Panel):
 
         usr = session.online_users.get(settings.username)
 
-        row = layout.row()
-
         if session.state == STATE_ACTIVE:
             if 'SessionBackupTimer' in registry:
+                row = layout.row()
                 row.alert = True
                 row.operator('session.cancel_autosave', icon="CANCEL")
                 row.alert = False
-            else:
+            # else:
-                row.operator('session.save', icon="FILE_TICK")
+            #     row.operator('session.save', icon="FILE_TICK")
 
             box = layout.box()
             row = box.row()
-            row.prop(runtime_settings, "filter_owned", text="Show only owned Nodes", icon_only=True, icon="DECORATE_UNLOCKED")
+            row.prop(runtime_settings, "filter_owned", text="Only show owned data blocks", icon_only=True, icon="DECORATE_UNLOCKED")
             row = box.row()
             row.prop(runtime_settings, "filter_name", text="Filter")
             row = box.row()
@@ -555,27 +617,18 @@ class SESSION_PT_repository(bpy.types.Panel):
             # Properties
             owned_nodes = [k for k, v in  session.repository.graph.items() if v.owner==settings.username]
 
-            filtered_node = owned_nodes if runtime_settings.filter_owned else session.repository.graph.keys()
+            filtered_node = owned_nodes if runtime_settings.filter_owned else list(session.repository.graph.keys())
 
             if runtime_settings.filter_name:
-                for node_id in filtered_node:
+                filtered_node = [n for n in filtered_node if runtime_settings.filter_name.lower() in session.repository.graph.get(n).data.get('name').lower()]
-                    node_instance = session.repository.graph.get(node_id)
-                    name = node_instance.data.get('name')
-                    if runtime_settings.filter_name not in name:
-                        filtered_node.remove(node_id)
 
             if filtered_node:
                 col = layout.column(align=True)
                 for key in filtered_node:
                     draw_property(context, col, key)
-
             else:
                 layout.row().label(text="Empty")
 
-        elif session.state == STATE_LOBBY and usr and usr['admin']:
-            row.operator("session.init", icon='TOOL_SETTINGS', text="Init")
-        else:
-            row.label(text="Waiting to start")
 
 class VIEW3D_PT_overlay_session(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
@@ -590,37 +643,74 @@ class VIEW3D_PT_overlay_session(bpy.types.Panel):
     def draw(self, context):
         layout = self.layout
 
-        view = context.space_data
-        overlay = view.overlay
-        display_all = overlay.show_overlays
-
-        col = layout.column()
-
-        row = col.row(align=True)
         settings = context.window_manager.session
+        pref = get_preferences()
         layout.active = settings.enable_presence
-        col = layout.column()
-        col.prop(settings, "presence_show_session_status")
-        col.prop(settings, "presence_show_selected")
-        col.prop(settings, "presence_show_user")
         
-        row = layout.column()
+        row = layout.row()
-        row.active = settings.presence_show_user
+        row.prop(settings, "enable_presence",text="Presence Overlay")
-        row.prop(settings, "presence_show_far_user")
+
+        row = layout.row()
+        row.prop(settings, "presence_show_selected",text="Selected Objects")
+
+        row = layout.row(align=True)
+        row.prop(settings, "presence_show_user", text="Users camera")
+        row.prop(settings, "presence_show_mode", text="Users mode")
+
+        col = layout.column()
+        if settings.presence_show_mode or settings.presence_show_user:
+            row = col.column()
+            row.prop(pref, "presence_text_distance", expand=True)
+
+        row = col.column()
+        row.prop(settings, "presence_show_far_user", text="Users on different scenes")  
+
+        col.prop(settings, "presence_show_session_status")
+        if settings.presence_show_session_status :
+            split = layout.split()
+            text_pos = split.column(align=True)
+            text_pos.active = settings.presence_show_session_status
+            text_pos.prop(pref, "presence_hud_hpos", expand=True)
+            text_pos.prop(pref, "presence_hud_vpos", expand=True)
+            text_scale = split.column()
+            text_scale.active = settings.presence_show_session_status
+            text_scale.prop(pref, "presence_hud_scale", expand=True)   
+        
+
+class SESSION_UL_network(bpy.types.UIList):
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index, flt_flag):
+        settings = get_preferences()
+        server_name = '-'
+        server_status = 'BLANK1'
+        server_private = 'BLANK1'
+        
+        server_name = item.server_name
+
+        split = layout.split(factor=0.7)
+        if item.is_private:
+            server_private = 'LOCKED'
+            split.label(text=server_name, icon=server_private)
+        else:
+            split.label(text=server_name)
+
+        from multi_user import icons
+        server_status = icons.icons_col["server_offline"]
+        if item.is_online:
+            server_status = icons.icons_col["server_online"]
+        split.label(icon_value=server_status.icon_id)
 
 classes = (
     SESSION_UL_users,
+    SESSION_UL_network,
     SESSION_PT_settings,
-    SESSION_PT_settings_user,
+    SESSION_PT_host_settings,
-    SESSION_PT_settings_network,
-    SESSION_PT_presence,
     SESSION_PT_advanced_settings,
     SESSION_PT_user,
+    SESSION_PT_sync,
     SESSION_PT_repository,
     VIEW3D_PT_overlay_session,
 )
 
-
 register, unregister = bpy.utils.register_classes_factory(classes)
 
 if __name__ == "__main__":

multi_user/utils.py

@@ -38,6 +38,14 @@ from replication.constants import (STATE_ACTIVE, STATE_AUTH,
                                   STATE_LOBBY,
                                   CONNECTING)
 
+CLEARED_DATABLOCKS = ['actions', 'armatures', 'cache_files', 'cameras',
+                     'collections', 'curves', 'filepath', 'fonts',
+                     'grease_pencils', 'images', 'lattices', 'libraries',
+                     'lightprobes', 'lights', 'linestyles', 'masks',
+                     'materials', 'meshes', 'metaballs', 'movieclips',
+                     'node_groups', 'objects', 'paint_curves', 'particles',
+                     'scenes', 'shape_keys', 'sounds', 'speakers', 'texts',
+                     'textures', 'volumes', 'worlds']
 
 def find_from_attr(attr_name, attr_value, list):
     for item in list:
@@ -101,23 +109,25 @@ def get_state_str(state):
 
 
 def clean_scene():
-    to_delete = [f for f in dir(bpy.data) if f not in ['brushes', 'palettes']]
+    for type_name in CLEARED_DATABLOCKS:
-    for type_name in to_delete:
+        sub_collection_to_avoid = [
-        try:
+            bpy.data.linestyles.get('LineStyle'),
-            sub_collection_to_avoid = [bpy.data.linestyles['LineStyle'], bpy.data.materials['Dots Stroke']]
+            bpy.data.materials.get('Dots Stroke')
+        ]
+
         type_collection = getattr(bpy.data, type_name)
         items_to_remove = [i for i in type_collection if i not in sub_collection_to_avoid]
         for item in items_to_remove:
             try:
                 type_collection.remove(item)
-                except:
+                logging.info(item.name)
-                    continue
             except:
                 continue
 
     # Clear sequencer
     bpy.context.scene.sequence_editor_clear()
 
+
 def get_selected_objects(scene, active_view_layer):
     return [obj.uuid for obj in scene.objects if obj.select_get(view_layer=active_view_layer)]
 

scripts/docker_server/Dockerfile

@@ -1,7 +1,7 @@
 # Download base image debian jessie
 FROM python:slim
 
-ARG replication_version=0.1.13
+ARG replication_version=0.9.1
 ARG version=0.1.1
 
 # Infos
@@ -22,4 +22,4 @@ RUN pip install replication==$replication_version
 
 # Run the server with parameters
 ENTRYPOINT ["/bin/sh", "-c"]
-CMD  ["python3 -m replication.server -pwd ${password} -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}"]

tests/test_bl_types/test_scene.py

@@ -12,6 +12,8 @@ def test_scene(clear_blend):
     get_preferences().sync_flags.sync_render_settings = True
 
     datablock = bpy.data.scenes.new("toto")
+    datablock.timeline_markers.new('toto', frame=10)
+    datablock.timeline_markers.new('tata', frame=1)
     datablock.view_settings.use_curve_mapping = True
     # Test
     implementation = BlScene()

tests/test_operators.py

@@ -1,20 +0,0 @@
-import os
-
-import pytest
-from deepdiff import DeepDiff
-
-import bpy
-import random
-
-
-def test_start_session():
-    result = bpy.ops.session.start()
-
-
-    assert 'FINISHED' in result
-
-def test_stop_session():
-
-    result = bpy.ops.session.stop()
-
-    assert 'FINISHED' in result