Commit: f07cd77b48c1d70a59bad895e1165e6b7cf7bb2d
Author: Antony Riakiotakis
Date: Thu Oct 30 15:24:56 2014 +0100
Branches: master
https://developer.blender.org/rBf07cd77b48c1d70a59bad895e1165e6b7cf7bb2d
Fix issue in fullscreen patch.
Don't change old event codes! Keymap diffing depends on those being the
same across versions to work.
===================================================================
M source/blender/windowmanager/wm_event_types.h
===================================================================
diff --git a/source/blender/windowmanager/wm_event_types.h
b/source/blender/windowmanager/wm_event_types.h
index 7dfc2b5..b7e9d63 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,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
