From ef765b3606754bd639b48995900d01258c71f002 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 15 Oct 2013 13:55:06 +0000 Subject: Fix [#37077] User prefs > Input and Outliner Keymaps mismatch in representation. Remove KeyMap mode from outliner, was an old half-finished features redondant with user preferences settings... Also moved key map item's "event type to map type" and map type defines at WM level, this is too much generic to be at RNA level. Also added a check in versionning code to convert all outdated outliner modes to a valid one (seems old 'verse' ones were not handled as well). Thanks to Brecht for reviews and advices! --- source/blender/makesdna/DNA_windowmanager_types.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'source/blender/makesdna/DNA_windowmanager_types.h') diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index fd1b0c8ec2d..ff43cc31b9a 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -263,6 +263,16 @@ enum { KMI_UPDATE = (1 << 3), }; +/* wmKeyMapItem.maptype */ +enum { + KMI_TYPE_KEYBOARD = 0, + KMI_TYPE_MOUSE = 1, + KMI_TYPE_TWEAK = 2, + KMI_TYPE_TEXTINPUT = 3, + KMI_TYPE_TIMER = 4, + KMI_TYPE_NDOF = 5, +}; + /* stored in WM, the actively used keymaps */ typedef struct wmKeyMap { struct wmKeyMap *next, *prev; -- cgit v1.2.3