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

feat: gpencil materials animation support

Browse Source
This commit is contained in:
Swann 2021-06-22 10:39:40 +02:00
parent 9f381b44c8
commit 3e552cb406
No known key found for this signature in database
GPG Key ID: E1D3641A7C43AACB
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
multi_user/bl_types/bl_material.py
View File

@ -426,8 +426,9 @@ class BlMaterial(ReplicatedDatablock):
if datablock.node_tree is None: if datablock.node_tree is None:
datablock.use_nodes = True datablock.use_nodes = True
load_animation_data(data.get('animation_data'), datablock.node_tree)
load_node_tree(data['node_tree'], datablock.node_tree) load_node_tree(data['node_tree'], datablock.node_tree)
load_animation_data(data.get('nodes_animation_data'), datablock.node_tree)
load_animation_data(data.get('animation_data'), datablock)
@staticmethod @staticmethod
def dump(datablock: object) -> dict: def dump(datablock: object) -> dict:
@ -495,8 +496,10 @@ class BlMaterial(ReplicatedDatablock):
data['grease_pencil'] = gp_mat_dumper.dump(datablock.grease_pencil) data['grease_pencil'] = gp_mat_dumper.dump(datablock.grease_pencil)
elif datablock.use_nodes: elif datablock.use_nodes:
data['node_tree'] = dump_node_tree(datablock.node_tree) data['node_tree'] = dump_node_tree(datablock.node_tree)
data['nodes_animation_data'] = dump_animation_data(datablock.node_tree)
data['animation_data'] = dump_animation_data(datablock)
data['animation_data'] = dump_animation_data(datablock.node_tree)
return data return data
@staticmethod @staticmethod
@ -510,8 +513,7 @@ class BlMaterial(ReplicatedDatablock):
if datablock.use_nodes: if datablock.use_nodes:
deps.extend(get_node_tree_dependencies(datablock.node_tree)) deps.extend(get_node_tree_dependencies(datablock.node_tree))
deps.extend(resolve_animation_dependencies(datablock))
deps.extend(resolve_animation_dependencies(datablock.node_tree))
return deps return deps