Merge branch 'develop' into 29-differential-revision

CHANGELOG.md

@@ -36,3 +36,17 @@ All notable changes to this project will be documented in this file.
 - Use a basic BFS approach for replication graph pre-load.
 - Serialization is now based on marshal (2x performance improvements).
 - Let pip chose python dependencies install path.
+
+## [0.0.3] - Upcoming
+
+### Added
+
+- Auto updater support
+- Performances improvements on Meshes, Gpencils, Actions
+- Multi-scene workflow support
+- Render setting synchronisation
+- Kick command
+
+### Changed
+
+- Config is now stored in blender user preference

multi_user/operators.py

@@ -130,7 +130,9 @@ class SessionStartOperator(bpy.types.Operator):
                     id=settings.username,
                     address=settings.ip,
                     port=settings.port,
-                    ipc_port=settings.ipc_port)
+                    ipc_port=settings.ipc_port,
+                    timeout=settings.connection_timeout
+                )
             except Exception as e:
                 self.report({'ERROR'}, repr(e))
                 logger.error(f"Error: {e}")
@@ -146,7 +148,8 @@ class SessionStartOperator(bpy.types.Operator):
                     id=settings.username,
                     address=settings.ip,
                     port=settings.port,
-                    ipc_port=settings.ipc_port
+                    ipc_port=settings.ipc_port,
+                    timeout=settings.connection_timeout
                 )
             except Exception as e:
                 self.report({'ERROR'}, repr(e))

multi_user/preferences.py

@@ -102,6 +102,11 @@ class SessionPrefs(bpy.types.AddonPreferences):
         name="cache directory",
         subtype="DIR_PATH",
         default=environment.DEFAULT_CACHE_DIR)
+    connection_timeout: bpy.props.IntProperty(
+        name='connection timeout',
+        description='connection timeout before disconnection',
+        default=1000
+    )
     # for UI
     category: bpy.props.EnumProperty(
         name="Category",

multi_user/ui.py

@@ -179,6 +179,9 @@ class SESSION_PT_settings_network(bpy.types.Panel):
         row = box.row()
         row.label(text="IPC Port:")
         row.prop(settings, "ipc_port", text="")
+        row = box.row()
+        row.label(text="Timeout (ms):")
+        row.prop(settings, "connection_timeout", text="")
 
         if runtime_settings.session_mode == 'HOST':
             row = box.row()