diff --git a/CHANGELOG.md b/CHANGELOG.md index da2de97..6fde5e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,4 +35,18 @@ All notable changes to this project will be documented in this file. - Right management takes view-layer in account for object selection. - 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. \ No newline at end of file +- 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 diff --git a/multi_user/libs/replication b/multi_user/libs/replication index 692b953..e9488ad 160000 --- a/multi_user/libs/replication +++ b/multi_user/libs/replication @@ -1 +1 @@ -Subproject commit 692b953af861c564ac481f40272bc0c88982619b +Subproject commit e9488ad77cd56699d0ae06b1c003a761df2701ce diff --git a/multi_user/operators.py b/multi_user/operators.py index 2b69b86..3aa3022 100644 --- a/multi_user/operators.py +++ b/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)) diff --git a/multi_user/preferences.py b/multi_user/preferences.py index 414c2ef..a4631ae 100644 --- a/multi_user/preferences.py +++ b/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", diff --git a/multi_user/ui.py b/multi_user/ui.py index 1c13367..e3ce2fd 100644 --- a/multi_user/ui.py +++ b/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()