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

Merge branch '245-skin-modifier-vertex-radius-not-synchronized' into 'develop'

Browse Source 
Resolve "skin modifier vertex radius not synchronized"

See merge request slumber/multi-user!165
This commit is contained in:
Swann Martinez
2022-02-07 14:08:22 +00:00
parent 97cec4f9af cc829b66d1
commit 2495b5b0e7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
multi_user/bl_types/bl_object.py
View File

@ -609,6 +609,13 @@ class BlObject(ReplicatedDatablock):
if datablock.data is None and img_uuid: if datablock.data is None and img_uuid:
datablock.data = get_datablock_from_uuid(img_uuid, None) datablock.data = get_datablock_from_uuid(img_uuid, None)
if hasattr(datablock, 'cycles_visibility') \
and 'cycles_visibility' in data:
loader.load(datablock.cycles_visibility, data['cycles_visibility'])
if hasattr(datablock, 'modifiers'):
load_modifiers(data['modifiers'], datablock.modifiers)
if hasattr(object_data, 'skin_vertices') \ if hasattr(object_data, 'skin_vertices') \
and object_data.skin_vertices\ and object_data.skin_vertices\
and 'skin_vertices' in data: and 'skin_vertices' in data:
@ -618,13 +625,6 @@ class BlObject(ReplicatedDatablock):
skin_data.data, skin_data.data,
SKIN_DATA) SKIN_DATA)
if hasattr(datablock, 'cycles_visibility') \
and 'cycles_visibility' in data:
loader.load(datablock.cycles_visibility, data['cycles_visibility'])
if hasattr(datablock, 'modifiers'):
load_modifiers(data['modifiers'], datablock.modifiers)
constraints = data.get('constraints') constraints = data.get('constraints')
if constraints: if constraints:
load_constraints(constraints, datablock.constraints) load_constraints(constraints, datablock.constraints)