diff options
| author | Campbell Barton <campbell@blender.org> | 2022-03-08 05:58:45 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-03-08 06:01:49 +0300 |
| commit | 59c972b40ab0bb7a072984c7f787784e0e0b1d9e (patch) | |
| tree | 61e1929c9f7085759dc55d01690304f8618c2ae9 | |
| parent | 88b2bbc649ad588c9f6fcf35d9193e9c8ac86a51 (diff) | |
Event System: remove unused NDOF buttons
GHOST always converts NDOF keyboard buttons into keyboard events
so there is no need to expose their values for Blender event types.
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 8835591f303..dcba0ff574b 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -98,11 +98,13 @@ static const EnumPropertyItem event_ndof_type_items[] = { {NDOF_BUTTON_DOMINANT, "NDOF_BUTTON_DOMINANT", 0, "Dominant", ""}, {NDOF_BUTTON_PLUS, "NDOF_BUTTON_PLUS", 0, "Plus", ""}, {NDOF_BUTTON_MINUS, "NDOF_BUTTON_MINUS", 0, "Minus", ""}, +# if 0 /* Never used (converted to keyboard events by GHOST). */ /* keyboard emulation */ {NDOF_BUTTON_ESC, "NDOF_BUTTON_ESC", 0, "Esc"}, {NDOF_BUTTON_ALT, "NDOF_BUTTON_ALT", 0, "Alt"}, {NDOF_BUTTON_SHIFT, "NDOF_BUTTON_SHIFT", 0, "Shift"}, {NDOF_BUTTON_CTRL, "NDOF_BUTTON_CTRL", 0, "Ctrl"}, +# endif /* general-purpose buttons */ {NDOF_BUTTON_1, "NDOF_BUTTON_1", 0, "Button 1", ""}, {NDOF_BUTTON_2, "NDOF_BUTTON_2", 0, "Button 2", ""}, @@ -311,11 +313,13 @@ const EnumPropertyItem rna_enum_event_type_items[] = { {NDOF_BUTTON_DOMINANT, "NDOF_BUTTON_DOMINANT", 0, "NDOF Dominant", "NdofDom"}, {NDOF_BUTTON_PLUS, "NDOF_BUTTON_PLUS", 0, "NDOF Plus", "Ndof+"}, {NDOF_BUTTON_MINUS, "NDOF_BUTTON_MINUS", 0, "NDOF Minus", "Ndof-"}, +#if 0 /* Never used (converted to keyboard events by GHOST). */ /* keyboard emulation */ {NDOF_BUTTON_ESC, "NDOF_BUTTON_ESC", 0, "NDOF Esc", "NdofEsc"}, {NDOF_BUTTON_ALT, "NDOF_BUTTON_ALT", 0, "NDOF Alt", "NdofAlt"}, {NDOF_BUTTON_SHIFT, "NDOF_BUTTON_SHIFT", 0, "NDOF Shift", "NdofShift"}, {NDOF_BUTTON_CTRL, "NDOF_BUTTON_CTRL", 0, "NDOF Ctrl", "NdofCtrl"}, +#endif /* general-purpose buttons */ {NDOF_BUTTON_1, "NDOF_BUTTON_1", 0, "NDOF Button 1", "NdofB1"}, {NDOF_BUTTON_2, "NDOF_BUTTON_2", 0, "NDOF Button 2", "NdofB2"}, diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index 5ced501dd49..0a0fdfa769a 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -275,11 +275,17 @@ enum { NDOF_BUTTON_DOMINANT = 0x01a3, /* 419 */ NDOF_BUTTON_PLUS = 0x01a4, /* 420 */ NDOF_BUTTON_MINUS = 0x01a5, /* 421 */ + +/* Disabled as GHOST converts these to keyboard events + * which use regular keyboard event handling logic. */ +#if 0 /* keyboard emulation */ NDOF_BUTTON_ESC = 0x01a6, /* 422 */ NDOF_BUTTON_ALT = 0x01a7, /* 423 */ NDOF_BUTTON_SHIFT = 0x01a8, /* 424 */ NDOF_BUTTON_CTRL = 0x01a9, /* 425 */ +#endif + /* general-purpose buttons */ NDOF_BUTTON_1 = 0x01aa, /* 426 */ NDOF_BUTTON_2 = 0x01ab, /* 427 */ |