diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-05-26 16:04:17 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-05-26 16:04:17 +0300 |
| commit | 299682bde72d58b6995b645859983481a8895826 (patch) | |
| tree | 231400fcd0aeecace6a84ae2b7f3976b94899f77 /release/scripts/startup/bl_ui/properties_grease_pencil_common.py | |
| parent | 35bd5968761dbe549b6b3e9d493e84281beef15d (diff) | |
| parent | d3275178fe329d91e27fd42c689de2254b946882 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_grease_pencil_common.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_grease_pencil_common.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 64eda42c87a..07c9fc363b5 100644 --- 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 |