diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-02 23:43:52 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-02 23:43:52 +0400 |
| commit | 92450a29fba479c3769760797a8688a859560786 (patch) | |
| tree | ab390b60a739589d0f31a97fd1ec96654773a50c /source/blender/makesrna/intern/rna_wm.c | |
| parent | cc86176a608ac97d064e53d52e2abad8479f2d56 (diff) | |
Fix #35157: export key configuration did not export text input events correctly.
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index f42197ec0a9..c6a8e26eeac 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -124,6 +124,11 @@ EnumPropertyItem event_timer_type_items[] = { {0, NULL, 0, NULL, NULL} }; +EnumPropertyItem event_textinput_type_items[] = { + {KM_TEXTINPUT, "TEXTINPUT", 0, "Text Input", ""}, + {0, NULL, 0, NULL, NULL} +}; + EnumPropertyItem event_ndof_type_items[] = { {NDOF_MOTION, "NDOF_MOTION", 0, "Motion", ""}, /* buttons on all 3dconnexion devices */ @@ -319,6 +324,8 @@ EnumPropertyItem event_type_items[] = { {MEDIAFIRST, "MEDIA_FIRST", 0, "Media First", ""}, {MEDIALAST, "MEDIA_LAST", 0, "Media Last", ""}, {0, "", 0, NULL, NULL}, + {KM_TEXTINPUT, "TEXTINPUT", 0, "Text Input", ""}, + {0, "", 0, NULL, NULL}, {WINDEACTIVATE, "WINDOW_DEACTIVATE", 0, "Window Deactivate", ""}, {TIMER, "TIMER", 0, "Timer", ""}, {TIMER0, "TIMER0", 0, "Timer 0", ""}, @@ -664,6 +671,7 @@ static EnumPropertyItem *rna_KeyMapItem_type_itemf(bContext *UNUSED(C), PointerR if (map_type == KMI_TYPE_TWEAK) return event_tweak_type_items; if (map_type == KMI_TYPE_TIMER) return event_timer_type_items; if (map_type == KMI_TYPE_NDOF) return event_ndof_type_items; + if (map_type == KMI_TYPE_TEXTINPUT) return event_textinput_type_items; else return event_type_items; } |