Merge branch 'blender-v2.83-release'

2020-05-26 15:04:17 +02:00
parent 35bd596876 d3275178fe
commit 299682bde7
1 changed files with 1 additions and 1 deletions
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -612,7 +612,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 len(ob.material_slots) > 0 and ob.active_material_index >= 0:
                        ma = ob.material_slots[ob.active_material_index].material
                else:
                    ma = gp_settings.material