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

fix: presence selection error

Browse Source
This commit is contained in:
Swann Martinez
2019-09-30 16:12:19 +02:00
parent c855fdaf53
commit 36b5561569
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bl_types/bl_user.py
View File

@ -44,6 +44,8 @@ class BlUser(BlDatablock):
def diff(self): def diff(self):
if not self.pointer:
return False
if self.pointer.is_dirty: if self.pointer.is_dirty:
self.pointer.is_dirty = False self.pointer.is_dirty = False
return True return True

2
operators.py
View File

@ -126,7 +126,7 @@ class SessionStartOperator(bpy.types.Operator):
settings.client_color.b, settings.client_color.b,
1), 1),
) )
settings.user_uuid = client.add(usr) settings.user_uuid = client.add(usr,owner=settings.username)
client.commit(settings.user_uuid) client.commit(settings.user_uuid)
delayables.append(delayable.ClientUpdate( delayables.append(delayable.ClientUpdate(

9
presence.py
View File

@ -187,12 +187,10 @@ class DrawFactory(object):
self.d2d_items.clear() self.d2d_items.clear()
def draw_client_selection(self, client_uuid, client_color, client_selection): def draw_client_selection(self, client_uuid, client_color, client_selection):
local_username = bpy.context.window_manager.session.username local_user = bpy.context.window_manager.session.user_uuid
if client_selection and local_user != client_uuid:
self.flush_selection() self.flush_selection()
if client_selection:
for select_ob in client_selection: for select_ob in client_selection:
drawable_key = "{}_select_{}".format(client_uuid, select_ob) drawable_key = "{}_select_{}".format(client_uuid, select_ob)
indices = ( indices = (
@ -220,8 +218,9 @@ class DrawFactory(object):
def draw_client_camera(self, client_uuid, client_location, client_color): def draw_client_camera(self, client_uuid, client_location, client_color):
if client_location: if client_location:
local_username = bpy.context.window_manager.session.username local_user = bpy.context.window_manager.session.user_uuid
if local_user != client_uuid:
try: try:
indices = ( indices = (
(1, 3), (2, 1), (3, 0), (1, 3), (2, 1), (3, 0),