Merge branch 'blender-v4.3-release'

This commit is contained in:
Campbell Barton
2024-11-02 15:27:53 +11:00

View File

@@ -210,8 +210,6 @@ static GHOST_TKey convertSDLKey(SDL_Scancode key)
}
else {
switch (key) {
/* TODO SDL_SCANCODE_NONUSBACKSLASH */
GXMAP(type, SDL_SCANCODE_BACKSPACE, GHOST_kKeyBackSpace);
GXMAP(type, SDL_SCANCODE_TAB, GHOST_kKeyTab);
GXMAP(type, SDL_SCANCODE_RETURN, GHOST_kKeyEnter);
@@ -289,6 +287,12 @@ static GHOST_TKey convertSDLKey(SDL_Scancode key)
// GXMAP(type, XF86XK_AudioRewind, GHOST_kKeyMediaFirst);
GXMAP(type, SDL_SCANCODE_AUDIONEXT, GHOST_kKeyMediaLast);
/* International Keys. */
/* This key has multiple purposes,
* however the only GHOST key that uses the scan-code is GrLess. */
GXMAP(type, SDL_SCANCODE_NONUSBACKSLASH, GHOST_kKeyGrLess);
default:
printf("Unknown\n");
type = GHOST_kKeyUnknown;