diff options
| author | Germano <germano.costa@ig.com.br> | 2018-01-21 23:45:47 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2018-01-21 23:45:47 +0300 |
| commit | 790025c01ed76c06e69e6054f1a718ca57771e28 (patch) | |
| tree | 7461d495f199142172b0efa34e5ad75ea65def6a /source/blender/editors/interface/interface_ops.c | |
| parent | 99efebd2dd24a8e0827cf0f13bc40c2844946676 (diff) | |
| parent | 8d671f6f6550605ac738f7a9727375a024614837 (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# intern/cycles/blender/blender_mesh.cpp
# source/blender/editors/screen/screen_ops.c
# source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/editors/interface/interface_ops.c')
| -rw-r--r-- | source/blender/editors/interface/interface_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index eeda0a25195..16525dfbc9e 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -1485,7 +1485,7 @@ void ED_keymap_ui(wmKeyConfig *keyconf) * through until a suitable eyedropper for the active button is found */ WM_keymap_add_item(keymap, "UI_OT_eyedropper_color", EKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "UI_OT_eyedropper_colorband", EKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "UI_OT_eyedropper_colorband_point", EKEY, KM_PRESS , KM_ALT, 0); + WM_keymap_add_item(keymap, "UI_OT_eyedropper_colorband_point", EKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "UI_OT_eyedropper_id", EKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "UI_OT_eyedropper_depth", EKEY, KM_PRESS, 0, 0); |