[Bf-blender-cvs] [b0df9b51b4e] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonioya]

Commit: b0df9b51b4e0278dd218ca4e2ffde7e689ff8951
Author: Antonioya
Date:   Fri Dec 14 16:53:17 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb0df9b51b4e0278dd218ca4e2ffde7e689ff8951

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 44ed220ab25,4da5455298f..aa6adee0d19
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@@ -1594,9 -1583,8 +1594,9 @@@ class VIEW3D_PT_tools_active(ToolSelect
              _defs_gpencil_paint.box,
              _defs_gpencil_paint.circle,
              _defs_gpencil_paint.arc,
 +            _defs_gpencil_paint.curve,
          ],
-         'GPENCIL_EDIT': [
+         'EDIT_GPENCIL': [
              *_tools_gpencil_select,
              _defs_view3d_generic.cursor,
              None,
diff --cc release/scripts/startup/bl_ui/space_topbar.py
index 5085dce9f13,f73d21dcfb8..a94ebea4561
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@@ -375,19 -375,8 +375,19 @@@ class _draw_left_context_mode
  
                  draw_color_selector()
  
 +                if tool.name in {"Arc", "Curve", "Line", "Box", "Circle"}:
 +                    settings = context.tool_settings.gpencil_sculpt
 +                    row = layout.row(align=True)
 +                    row.prop(settings, "use_thickness_curve", text="", icon='CURVE_DATA')
 +                    sub = row.row(align=True)
 +                    sub.active = settings.use_thickness_curve
 +                    sub.popover(
 +                        panel="TOPBAR_PT_gpencil_primitive",
 +                        text="Thickness Profile"
 +                    )
 +
          @staticmethod
-         def GPENCIL_SCULPT(context, layout, tool):
+         def SCULPT_GPENCIL(context, layout, tool):
              if (tool is None) or (not tool.has_datablock):
                  return
              tool_settings = context.tool_settings