diff options
| author | Joshua Leung <aligorith@gmail.com> | 2015-12-13 11:03:13 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2015-12-13 11:03:13 +0300 |
| commit | a1f87064c4c0cd9e8eafc19c599c4ad4ccdba49f (patch) | |
| tree | d016e95050f10eda7bc44e1bdfa2f7c4fc0fc024 /source/blender/windowmanager/wm_event_types.h | |
| parent | d9ee88d126ddb59b68d2561694b522a99e4923b6 (diff) | |
Grease Pencil: Merge GPencil_Editing_Stage3 branch into master
This commit merges all the work done in the GPencil_Editing_Stage3 branch
as of ef2aecf2db981b5344e0d14e7f074f1742b0b2f7 into master. For more details
about the changes that this brings, see the WIP release notes:
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.77/GPencil
Diffstat (limited to 'source/blender/windowmanager/wm_event_types.h')
| -rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index 390e769aa88..c32ded28126 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -92,6 +92,10 @@ 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, /* *** Start of keyboard codes. *** */ |