diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-10-28 20:51:35 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-28 20:51:35 +0300 |
commit | 5a481e41ce8fcdb64dd8486a2bdb5eea3aad8254 (patch) | |
tree | 6cf311a9a8e997d8d5b3b960c2b83890c7f268cd /source/blender | |
parent | e38a00f98183975facc3acdaf863982c1b98ff92 (diff) | |
parent | 43a8fdb6addf3a31b34cdd5d7989e428bec37c07 (diff) |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 1 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_icons.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 4e4db46adf6..1c2bc54d821 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -1027,6 +1027,7 @@ DEF_ICON_COLOR(EVENT_TAB) DEF_ICON_COLOR(EVENT_PAGEUP) DEF_ICON_COLOR(EVENT_PAGEDOWN) DEF_ICON_COLOR(EVENT_RETURN) +DEF_ICON_COLOR(EVENT_SPACEKEY) /* add as needed. */ /* Undefine all types. */ diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 1495fb7e716..ab5fdfd69e0 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -694,6 +694,7 @@ static void init_event_icons(void) INIT_EVENT_ICON(ICON_EVENT_PAGEUP, PAGEUPKEY, KM_ANY); INIT_EVENT_ICON(ICON_EVENT_PAGEDOWN, PAGEDOWNKEY, KM_ANY); INIT_EVENT_ICON(ICON_EVENT_RETURN, RETKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_SPACEKEY, SPACEKEY, KM_ANY); g_di_event_list = di_next; |