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

[Antonioya]

Commit: 1a44501f574a2d46849753edec610a6b1fad87b5
Author: Antonioya
Date:   Fri Dec 14 19:17:08 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB1a44501f574a2d46849753edec610a6b1fad87b5

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	release/scripts/presets/keyconfig/keymap_data/blender_default.py

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



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

diff --cc release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 6ecfc6cd46e,72b3e166cc1..8c386af57be
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@@ -5709,19 -5709,10 +5709,19 @@@ def km_3d_view_tool_paint_gpencil_arc(p
          ]},
      )
  
- def km_3d_view_tool_gpencil_paint_curve(params):
++def km_3d_view_tool_paint_gpencil_curve(params):
 +    return (
-         "3D View Tool: Gpencil Paint, Curve",
++        "3D View Tool: Paint Gpencil, Curve",
 +        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
 +        {"items": [
 +            ("gpencil.primitive", {"type": params.tool_tweak, "value": 'ANY'},
 +             {"properties": [("type", 'CURVE'), ("wait_for_input", False)]}),
 +        ]},
 +    )	
  
- def km_3d_view_tool_gpencil_edit_select(params):
+ def km_3d_view_tool_edit_gpencil_select(params):
      return (
-         "3D View Tool: Gpencil Edit, Select",
+         "3D View Tool: Edit Gpencil, Select",
          {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
          {"items": _template_items_tool_select(params, "gpencil.select", "view3d.cursor3d")},
      )
@@@ -5988,18 -6015,21 +6024,22 @@@ def generate_keymaps(params=None)
          km_3d_view_tool_paint_weight_sample_weight(params),
          km_3d_view_tool_paint_weight_sample_vertex_group(params),
          km_3d_view_tool_paint_weight_gradient(params),
-         km_3d_view_tool_gpencil_paint_line(params),
-         km_3d_view_tool_gpencil_paint_box(params),
-         km_3d_view_tool_gpencil_paint_circle(params),
-         km_3d_view_tool_gpencil_paint_arc(params),
-         km_3d_view_tool_gpencil_paint_curve(params),
-         km_3d_view_tool_gpencil_edit_select(params),
-         km_3d_view_tool_gpencil_edit_select_box(params),
-         km_3d_view_tool_gpencil_edit_select_circle(params),
-         km_3d_view_tool_gpencil_edit_select_lasso(params),
-         km_3d_view_tool_gpencil_edit_bend(params),
-         km_3d_view_tool_gpencil_edit_shear(params),
-         km_3d_view_tool_gpencil_edit_to_sphere(params),
+         km_3d_view_tool_paint_gpencil_line(params),
+         km_3d_view_tool_paint_gpencil_box(params),
+         km_3d_view_tool_paint_gpencil_circle(params),
+         km_3d_view_tool_paint_gpencil_arc(params),
++        km_3d_view_tool_paint_gpencil_curve(params),
+         km_3d_view_tool_edit_gpencil_select(params),
+         km_3d_view_tool_edit_gpencil_select_box(params),
+         km_3d_view_tool_edit_gpencil_select_circle(params),
+         km_3d_view_tool_edit_gpencil_select_lasso(params),
+         km_3d_view_tool_edit_gpencil_bend(params),
+         km_3d_view_tool_edit_gpencil_shear(params),
+         km_3d_view_tool_edit_gpencil_to_sphere(params),
+         km_3d_view_tool_sculpt_gpencil_select(params),
+         km_3d_view_tool_sculpt_gpencil_select_box(params),
+         km_3d_view_tool_sculpt_gpencil_select_circle(params),
+         km_3d_view_tool_sculpt_gpencil_select_lasso(params),
      ]
  
  # ------------------------------------------------------------------------------