Merge branch 'develop' into 132-fix-undo-edit-last-operation-redo-handling-2

This commit is contained in:
Swann 2021-02-02 11:09:11 +01:00
commit 819598ebd9
No known key found for this signature in database
GPG Key ID: E1D3641A7C43AACB

View File

@ -409,6 +409,9 @@ class BlMaterial(BlDatablock):
'fill_style', 'fill_style',
'gradient_type', 'gradient_type',
# 'fill_image', # 'fill_image',
'use_stroke_holdout',
'use_overlap_strokes',
'use_fill_holdout',
] ]
data['grease_pencil'] = gp_mat_dumper.dump(instance.grease_pencil) data['grease_pencil'] = gp_mat_dumper.dump(instance.grease_pencil)
elif instance.use_nodes: elif instance.use_nodes: