[Bf-blender-cvs] [dbc9f1b0f3c] property-search-ui: Merge branch 'master' into property-search-ui

[Hans Goudey]

Commit: dbc9f1b0f3c8a9408415059689070dc1ac7ad69c
Author: Hans Goudey
Date:   Mon Jun 29 17:08:57 2020 -0400
Branches: property-search-ui
https://developer.blender.org/rBdbc9f1b0f3c8a9408415059689070dc1ac7ad69c

Merge branch 'master' into property-search-ui

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



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

diff --cc release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 1124608053a,b924625b4de..e7a225f911f
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@@ -728,8 -728,11 +728,13 @@@ def km_property_editor(_params)
           {"properties": [("direction", 'PREV'), ], },),
          ("screen.space_context_cycle", {"type": 'WHEELDOWNMOUSE', "value": 'PRESS', "ctrl": True},
           {"properties": [("direction", 'NEXT'), ], },),
 +        ("buttons.start_filter", {"type": 'F', "value": 'PRESS', "ctrl": True}, None),
 +        ("buttons.clear_filter", {"type": 'F', "value": 'PRESS', "alt": True}, None),
+         # Modifier panels
+         ("object.modifier_remove", {"type": 'X', "value": 'PRESS'}, {"properties": [("report", True)]}),
+         ("object.modifier_remove", {"type": 'DEL', "value": 'PRESS'}, {"properties": [("report", True)]}),
+         ("object.modifier_copy", {"type": 'D', "value": 'PRESS', "shift": True}, None),
+         ("object.modifier_apply", {"type": 'A', "value": 'PRESS', "ctrl": True}, {"properties": [("report", True)]}),
      ])
  
      return keymap