diff options
| author | Severin <eiseljulian@gmail.com> | 2018-07-02 15:50:45 +0300 |
|---|---|---|
| committer | Severin <eiseljulian@gmail.com> | 2018-07-02 15:50:45 +0300 |
| commit | 5a17c9bcbca737525fa535ceb45f9769a34a4df7 (patch) | |
| tree | c7867d25494d053d11837d04b1ab8b86526a189d /source/blender/editors/mask/mask_edit.c | |
| parent | 9887b38692e3bcf7ba613ca947fd76e299c58cbd (diff) | |
| parent | 20046defd735684a42750c4cb68d20d78ad5180c (diff) | |
Merge branch 'blender2.8' into temp-tab_drag_droptemp-tab_drag_drop
Diffstat (limited to 'source/blender/editors/mask/mask_edit.c')
| -rw-r--r-- | source/blender/editors/mask/mask_edit.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c index f51f05f2d2e..85f5836ecd7 100644 --- a/source/blender/editors/mask/mask_edit.c +++ b/source/blender/editors/mask/mask_edit.c @@ -57,7 +57,7 @@ /********************** generic poll functions *********************/ -int ED_maskedit_poll(bContext *C) +bool ED_maskedit_poll(bContext *C) { ScrArea *sa = CTX_wm_area(C); if (sa) { @@ -73,7 +73,7 @@ int ED_maskedit_poll(bContext *C) return false; } -int ED_maskedit_mask_poll(bContext *C) +bool ED_maskedit_mask_poll(bContext *C) { ScrArea *sa = CTX_wm_area(C); if (sa) { @@ -540,9 +540,8 @@ void ED_keymap_mask(wmKeyConfig *keyconf) /* geometry */ WM_keymap_add_item(keymap, "MASK_OT_add_vertex_slide", ACTIONMOUSE, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "MASK_OT_add_feather_vertex_slide", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0); -#ifdef USE_WM_KEYMAP_27X + WM_keymap_add_item(keymap, "MASK_OT_delete", XKEY, KM_PRESS, 0, 0); -#endif WM_keymap_add_item(keymap, "MASK_OT_delete", DELKEY, KM_PRESS, 0, 0); /* selection */ |