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

Merge branch '219-lock-annotation-doesn-t-sync' into 'develop'

Browse Source 
Resolve "Lock annotation doesn't sync"

See merge request slumber/multi-user!143
This commit is contained in:
Swann Martinez 2021-07-14 10:41:32 +00:00
commit cab6625399
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
multi_user/bl_types/bl_gpencil.py
View File

@ -162,7 +162,7 @@ def dump_layer(layer):
'hide', 'hide',
'annotation_hide', 'annotation_hide',
'lock', 'lock',
# 'lock_frame', 'lock_frame',
# 'lock_material', # 'lock_material',
# 'use_mask_layer', # 'use_mask_layer',
'use_lights', 'use_lights',
@ -170,12 +170,13 @@ def dump_layer(layer):
'select', 'select',
'show_points', 'show_points',
'show_in_front', 'show_in_front',
# 'thickness'
# 'parent', # 'parent',
# 'parent_type', # 'parent_type',
# 'parent_bone', # 'parent_bone',
# 'matrix_inverse', # 'matrix_inverse',
] ]
if layer.id_data.is_annotation: if layer.thickness != 0:
dumper.include_filter.append('thickness') dumper.include_filter.append('thickness')
dumped_layer = dumper.dump(layer) dumped_layer = dumper.dump(layer)

5
multi_user/timers.py
View File

@ -162,7 +162,7 @@ class AnnotationUpdates(Timer):
logging.debug( logging.debug(
"Getting the right on the annotation GP") "Getting the right on the annotation GP")
porcelain.lock(session.repository, porcelain.lock(session.repository,
registered_gp.uuid, [registered_gp.uuid],
ignore_warnings=True, ignore_warnings=True,
affect_dependencies=False) affect_dependencies=False)
@ -172,9 +172,10 @@ class AnnotationUpdates(Timer):
elif self._annotating: elif self._annotating:
porcelain.unlock(session.repository, porcelain.unlock(session.repository,
registered_gp.uuid, [registered_gp.uuid],
ignore_warnings=True, ignore_warnings=True,
affect_dependencies=False) affect_dependencies=False)
self._annotating = False
class DynamicRightSelectTimer(Timer): class DynamicRightSelectTimer(Timer):
def __init__(self, timeout=.1): def __init__(self, timeout=.1):