Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: kick command is back in the ui

Browse Source 
clean: unused logs
This commit is contained in:
Swann
2020-06-10 14:56:03 +02:00
parent 7759234ea3
commit 12c0dab881
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
multi_user/bl_types/bl_datablock.py
View File

@ -117,8 +117,6 @@ class BlDatablock(ReplicatedDatablock):
datablock_ref = utils.find_from_attr('uuid', self.uuid, datablock_root) datablock_ref = utils.find_from_attr('uuid', self.uuid, datablock_root)
if not datablock_ref: if not datablock_ref:
import logging
logging.info(self.bl_id)
datablock_ref = datablock_root.get( datablock_ref = datablock_root.get(
self.data['name'], # Resolve by name self.data['name'], # Resolve by name
self._construct(data=self.data)) # If it doesn't exist create it self._construct(data=self.data)) # If it doesn't exist create it

1
multi_user/bl_types/bl_mesh.py
View File

@ -56,7 +56,6 @@ class BlMesh(BlDatablock):
bl_icon = 'MESH_DATA' bl_icon = 'MESH_DATA'
def _construct(self, data): def _construct(self, data):
logging.error(f"Loading {data['name']}")
instance = bpy.data.meshes.new(data["name"]) instance = bpy.data.meshes.new(data["name"])
instance.uuid = self.uuid instance.uuid = self.uuid
return instance return instance

1
multi_user/operators.py
View File

@ -124,6 +124,7 @@ class SessionStartOperator(bpy.types.Operator):
for scene in bpy.data.scenes: for scene in bpy.data.scenes:
scene_uuid = client.add(scene) scene_uuid = client.add(scene)
client.commit(scene_uuid) client.commit(scene_uuid)
client.push(scene_uuid)
if self.host: if self.host:
try: try:

7
multi_user/ui.py
View File

@ -196,6 +196,9 @@ class SESSION_PT_settings_network(bpy.types.Panel):
row = box.row() row = box.row()
row.label(text="Password:") row.label(text="Password:")
row.prop(runtime_settings, "password", text="") row.prop(runtime_settings, "password", text="")
row = box.row()
row.label(text="Start empty:")
row.prop(settings, "start_empty", text="")
row = box.row() row = box.row()
row.operator("session.start", text="CONNECT").host = False row.operator("session.start", text="CONNECT").host = False
@ -305,7 +308,7 @@ class SESSION_PT_user(bpy.types.Panel):
split.label(text="ping") split.label(text="ping")
row = layout.row() row = layout.row()
layout.template_list("SESSION_UL_users", "", context.window_manager, "online_users", context.window_manager, "user_index") layout.template_list("SESSION_UL_users", "", context.window_manager, "online_users", context.window_manager, "user_index")
if active_user != 0 and active_user.username != settings.username: if active_user != 0 and active_user.username != settings.username:
row = layout.row() row = layout.row()
@ -322,7 +325,7 @@ class SESSION_PT_user(bpy.types.Panel):
text="", text="",
icon='TIME').target_client = active_user.username icon='TIME').target_client = active_user.username
if runtime_settings.session_mode == 'HOST': if runtime_settings.admin:
user_operations.operator( user_operations.operator(
"session.kick", "session.kick",
text="", text="",