Merge branch 'blender-v2.82-release'

2020-02-05 11:08:57 +01:00
parent 79003fa0c4 db0121a009
commit edcec3aee0
3 changed files with 13 additions and 0 deletions
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -996,6 +996,8 @@ def brush_basic_texpaint_settings(layout, context, brush, *, compact=False):
 def brush_basic_gpencil_paint_settings(layout, context, brush, *, compact=False):
    gp_settings = brush.gpencil_settings
    tool = context.workspace.tools.from_space_view3d_mode(context.mode, create=False)
+    if gp_settings is None:
+        return

    # Brush details
    if brush.gpencil_tool == 'ERASE':