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

[Antonio Vazquez]

Commit: 4f9d4775a58e4f80a93284c46bfb8dc26f2c88cb
Author: Antonio Vazquez
Date:   Mon Jan 6 11:29:33 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB4f9d4775a58e4f80a93284c46bfb8dc26f2c88cb

Merge branch 'master' into greasepencil-object

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

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



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

diff --cc release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
index 907dd7a6e1a,10ee750f887..9024f57e799
--- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
+++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
@@@ -2769,117 -2494,17 +2731,117 @@@ def km_grease_pencil_stroke_vertex_mode
      items.extend([
          # Selection
          *_grease_pencil_selection(params),
 -        # Painting
 -        ("gpencil.sculpt_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
 +        # Brush strength
 +        ("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True},
 +         {"properties": [("data_path_primary", 'tool_settings.gpencil_vertex_paint.brush.gpencil_settings.pen_strength')]}),
 +        # Brush size
 +        ("wm.radial_control", {"type": 'F', "value": 'PRESS'},
 +         {"properties": [("data_path_primary", 'tool_settings.gpencil_vertex_paint.brush.size')]}),
 +        # Display
 +        *_grease_pencil_display(),
 +        # Tools
 +        op_tool("builtin_brush.Draw", {"type": 'D', "value": 'PRESS'}),
 +        op_tool("builtin_brush.Blur", {"type": 'F', "value": 'PRESS'}),
 +        op_tool("builtin_brush.Average", {"type": 'E', "value": 'PRESS'}),
 +        op_tool("builtin.brush.Smear", {"type": 'K', "value": 'PRESS'}),
 +        op_tool("builtin.brush.Replace", {"type": 'R', "value": 'PRESS'}),
 +        # Vertex Paint context menu
 +        op_panel("VIEW3D_PT_gpencil_vertex_context_menu", params.context_menu_event),
 +    ])
 +
 +    return keymap
 +
 +def km_grease_pencil_stroke_vertex_draw(params):
 +    items = []
 +    keymap = (
 +        "Grease Pencil Stroke Vertex (Draw)",
 +        {"space_type": 'EMPTY', "region_type": 'WINDOW'},
 +        {"items": items},
 +    )
 +
 +    items.extend([
 +        # Tint
 +        ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
           {"properties": [("wait_for_input", False)]}),
 -        ("gpencil.sculpt_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True},
 +        ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
 +         {"properties": [("wait_for_input", False)]}),
 +        # Brush strength
 +        ("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True},
 +         {"properties": [("data_path_primary", 'tool_settings.gpencil_vertex_paint.brush.gpencil_settings.pen_strength')]}),
 +        # Brush size
 +        ("wm.radial_control", {"type": 'F', "value": 'PRESS'},
 +         {"properties": [("data_path_primary", 'tool_settings.gpencil_vertex_paint.brush.size')]}),
 +    ])
 +
 +    return keymap
 +
 +
 +def km_grease_pencil_stroke_vertex_blur(params):
 +    items = []
 +    keymap = (
 +        "Grease Pencil Stroke Vertex (Blur)",
 +        {"space_type": 'EMPTY', "region_type": 'WINDOW'},
 +        {"items": items},
 +    )
 +
 +    items.extend([
 +        # Tint
 +        ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
 +         {"properties": [("wait_for_input", False)]}),
 +        # Brush strength
 +        ("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True},
 +         {"properties": [("data_path_primary", 'tool_settings.gpencil_vertex_paint.brush.gpencil_settings.pen_strength')]}),
 +        # Brush size
 +        ("wm.radial_control", {"type": 'F', "value": 'PRESS'},
 +         {"properties": [("data_path_primary", 'tool_settings.gpencil_vertex_paint.brush.size')]}),
 +    ])
 +
 +    return keymap
 +
 +
 +def km_grease_pencil_stroke_vertex_average(params):
 +    items = []
 +    keymap = (
 +        "Grease Pencil Stroke Vertex (Average)",
 +        {"space_type": 'EMPTY', "region_type": 'WINDOW'},
 +        {"items": items},
 +    )
 +
 +    items.extend([
 +        # Tint
 +        ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
 +         {"properties": [("wait_for_input", False)]}),
 +        ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
 +         {"properties": [("wait_for_input", False)]}),
 +        # Brush strength
 +        ("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True},
 +         {"properties": [("data_path_primary", 'tool_settings.gpencil_vertex_paint.brush.gpencil_settings.pen_strength')]}),
 +        # Brush size
 +        ("wm.radial_control", {"type": 'F', "value": 'PRESS'},
 +         {"properties": [("data_path_primary", 'tool_settings.gpencil_vertex_paint.brush.size')]}),
 +    ])
 +
 +    return keymap
 +
 +
 +def km_grease_pencil_stroke_vertex_smear(params):
 +    items = []
 +    keymap = (
 +        "Grease Pencil Stroke Vertex (Smear)",
 +        {"space_type": 'EMPTY', "region_type": 'WINDOW'},
 +        {"items": items},
 +    )
 +
 +    items.extend([
 +        # Tint
 +        ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
           {"properties": [("wait_for_input", False)]}),
          # Brush strength
-         ("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True},
+         ("wm.radial_control", {"type": 'U', "value": 'PRESS', "shift": True},
 -         {"properties": [("data_path_primary", 'tool_settings.gpencil_sculpt.weight_brush.strength')]}),
 -        # Brush size.
 +         {"properties": [("data_path_primary", 'tool_settings.gpencil_vertex_paint.brush.gpencil_settings.pen_strength')]}),
 +        # Brush size
-         ("wm.radial_control", {"type": 'F', "value": 'PRESS'},
+         ("wm.radial_control", {"type": 'S', "value": 'PRESS'},
 -         {"properties": [("data_path_primary", 'tool_settings.gpencil_sculpt.weight_brush.size')]}),
 +         {"properties": [("data_path_primary", 'tool_settings.gpencil_vertex_paint.brush.size')]}),
      ])
  
      return keymap