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

[Antonio Vazquez]

Commit: d3c4d982466ab695818821f0936141f818278bf4
Author: Antonio Vazquez
Date:   Thu Dec 12 09:32:36 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd3c4d982466ab695818821f0936141f818278bf4

Merge branch 'master' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/properties_data_modifier.py
	release/scripts/startup/bl_ui/properties_paint_common.py
	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

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



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

diff --cc release/scripts/startup/bl_ui/properties_paint_common.py
index b8ccd79665e,d8d90fec583..bdd07f3e832
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@@ -403,14 -422,14 +403,14 @@@ def brush_basic_gpencil_paint_settings(
  
      # FIXME: tools must use their own UI drawing!
      if tool.idname in {
 -            "builtin.arc",
 -            "builtin.curve",
 -            "builtin.line",
 -            "builtin.box",
 -            "builtin.circle",
 -            "builtin.polyline",
 +        "builtin.arc",
 +        "builtin.curve",
 +        "builtin.line",
 +        "builtin.box",
 +        "builtin.circle",
 +        "builtin.polyline",
      }:
-         settings = _context.tool_settings.gpencil_sculpt
+         settings = context.tool_settings.gpencil_sculpt
          if is_toolbar:
              row = layout.row(align=True)
              row.prop(settings, "use_thickness_curve", text="", icon='CURVE_DATA')