Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2014-10-30 17:24:56 +0300
committerAntony Riakiotakis <kalast@gmail.com>2014-10-30 17:26:31 +0300
commitf07cd77b48c1d70a59bad895e1165e6b7cf7bb2d (patch)
treecd8ecfa8a0e867ef7446317bca15797d73d13495
parentbe63ba315f10a85d381c860bfcad7c96c8eb3191 (diff)
Fix issue in fullscreen patch.
Don't change old event codes! Keymap diffing depends on those being the same across versions to work.
-rw-r--r--source/blender/windowmanager/wm_event_types.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h
index 7dfc2b52c33..b7e9d63751c 100644
--- a/source/blender/windowmanager/wm_event_types.h
+++ b/source/blender/windowmanager/wm_event_types.h
@@ -299,16 +299,19 @@ enum {
/* Tweak, gestures: 0x500x, 0x501x */
EVT_ACTIONZONE_AREA = 0x5000,
EVT_ACTIONZONE_REGION = 0x5001,
- EVT_ACTIONZONE_FULLSCREEN = 0x5002,
+ EVT_ACTIONZONE_FULLSCREEN = 0x5011,
+
/* tweak events, for L M R mousebuttons */
- EVT_TWEAK_L = 0x5003,
- EVT_TWEAK_M = 0x5004,
- EVT_TWEAK_R = 0x5005,
+ EVT_TWEAK_L = 0x5002,
+ EVT_TWEAK_M = 0x5003,
+ EVT_TWEAK_R = 0x5004,
/* tweak events for action or select mousebutton */
- EVT_TWEAK_A = 0x5006,
- EVT_TWEAK_S = 0x5007,
+ EVT_TWEAK_A = 0x5005,
+ EVT_TWEAK_S = 0x5006,
EVT_GESTURE = 0x5010,
+ /* 0x5011 is taken, see EVT_ACTIONZONE_FULLSCREEN */
+
/* Misc Blender internals: 0x502x */
EVT_FILESELECT = 0x5020,
EVT_BUT_OPEN = 0x5021,