diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-07 17:45:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-07 17:45:34 +0300 |
| commit | f0815b1322dc4f04dd949fd92049a99479e5f61d (patch) | |
| tree | 9388af5e754d416e3f9fac95a2cbc67e57531e9f /source/blender/windowmanager/wm_event_types.h | |
| parent | fcc5d7c29e02eae1429009cc02eb9c75d159f245 (diff) | |
| parent | 863e395ad8bc0c921a9c836018e2c17262340f46 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/wm_event_types.h')
| -rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index 5edd4a76127..db2fd5ce7f2 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -92,7 +92,7 @@ enum { WM_IME_COMPOSITE_EVENT = 0x0015, /* IME event, GHOST_kEventImeCompositionEnd in ghost */ WM_IME_COMPOSITE_END = 0x0016, - + /* Tablet/Pen Specific Events */ TABLET_STYLUS = 0x001a, TABLET_ERASER = 0x001b, |