diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-10-31 00:42:46 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-10-31 00:42:46 +0300 |
| commit | 8126b9f8a88265277c838b08e5f8e2fbcc690013 (patch) | |
| tree | 2c65c0a00094dfe1c60d8f6b4a0d4887b1abc930 /release | |
| parent | b1b0e56a72abf843ddc86288db6db7f3ec4be9aa (diff) | |
| parent | ed079850cb55de1c2cf41571e52eec6ebb34b27e (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'release')
| -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 e545ee971d8..b6db3cf0b97 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -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 |