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

[Antonioya]

Commit: 6dfc7969f54a73605e6ff4e1b740e284c3dad341
Author: Antonioya
Date:   Mon Dec 17 19:14:30 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB6dfc7969f54a73605e6ff4e1b740e284c3dad341

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 1cd56231bda,68b487ffe44..3f3f3be6cf1
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@@ -1600,11 -1590,10 +1600,11 @@@ class VIEW3D_PT_tools_active(ToolSelect
              _defs_gpencil_paint.generate_from_brushes,
              None,
              _defs_gpencil_paint.line,
-             _defs_gpencil_paint.box,
-             _defs_gpencil_paint.circle,
              _defs_gpencil_paint.arc,
              _defs_gpencil_paint.curve,
 +            _defs_gpencil_paint.chord,
+             _defs_gpencil_paint.box,
+             _defs_gpencil_paint.circle,
          ],
          'EDIT_GPENCIL': [
              *_tools_gpencil_select,