Merge branch '231-server-public-session-private-issue' into 'develop'

Server "public session" private issue

See merge request slumber/multi-user!151
This commit is contained in:
Swann Martinez 2021-07-28 15:34:24 +00:00
commit 583beaf6fe

View File

@ -220,7 +220,7 @@ class SessionConnectOperator(bpy.types.Operator):
users = bpy.data.window_managers['WinMan'].online_users users = bpy.data.window_managers['WinMan'].online_users
active_server = get_active_server_preset(context) active_server = get_active_server_preset(context)
admin_pass = active_server.admin_password if active_server.use_admin_password else None 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 None server_pass = active_server.server_password if active_server.use_server_password else ''
users.clear() users.clear()
deleyables.clear() deleyables.clear()
@ -291,7 +291,7 @@ class SessionHostOperator(bpy.types.Operator):
runtime_settings = context.window_manager.session runtime_settings = context.window_manager.session
users = bpy.data.window_managers['WinMan'].online_users users = bpy.data.window_managers['WinMan'].online_users
admin_pass = settings.host_admin_password if settings.host_use_admin_password else None 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 None server_pass = settings.host_server_password if settings.host_use_server_password else ''
users.clear() users.clear()
deleyables.clear() deleyables.clear()