Merge branch 'blender-v2.81-release'

This commit is contained in:
Antonio Vazquez
2019-10-30 22:42:46 +01:00

View File

@@ -892,7 +892,7 @@ class GreasePencilMaterialsPanel:
if is_view3d and brush is not None:
gp_settings = brush.gpencil_settings
if gp_settings.use_material_pin is False:
if ob.active_material_index > 0:
if ob.active_material_index >= 0:
ma = ob.material_slots[ob.active_material_index].material
else:
ma = gp_settings.material