[Bf-blender-cvs] [c0e989d3e52] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: c0e989d3e521217e991881070c1c674449e83b7e
Author: Antonio Vazquez
Date:   Wed Feb 5 11:10:54 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBc0e989d3e521217e991881070c1c674449e83b7e

Merge branch 'master' into greasepencil-object

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/properties_paint_common.py
index 440df1d34d3,ec3dec6c54d..cc8a6c49a9c
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@@ -998,10 -994,10 +998,12 @@@ def brush_basic_texpaint_settings(layou
  
  
  def brush_basic_gpencil_paint_settings(layout, context, brush, *, compact=False):
 +    tool_settings = context.tool_settings
 +    settings = tool_settings.gpencil_paint
      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':