forked from bartvdbraak/blender
Fix T43066: Joystick broken in GE since 2.73rc
Caused by move to SDL2, fix thanks to jensverwiebe.
This commit is contained in:
parent
fdddd4ed66
commit
bf169d6ca6
@ -111,7 +111,7 @@ SCA_Joystick *SCA_Joystick::GetInstance( short int joyindex )
|
|||||||
char *videodriver = getenv("SDL_VIDEODRIVER");
|
char *videodriver = getenv("SDL_VIDEODRIVER");
|
||||||
BLI_setenv("SDL_VIDEODRIVER", "dummy");
|
BLI_setenv("SDL_VIDEODRIVER", "dummy");
|
||||||
|
|
||||||
int success = (SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO) != -1 );
|
int success = (SDL_InitSubSystem(SDL_INIT_JOYSTICK) != -1 );
|
||||||
|
|
||||||
BLI_setenv("SDL_VIDEODRIVER", videodriver);
|
BLI_setenv("SDL_VIDEODRIVER", videodriver);
|
||||||
# endif
|
# endif
|
||||||
@ -156,11 +156,7 @@ void SCA_Joystick::ReleaseInstance()
|
|||||||
/* The video subsystem is required for joystick input to work. However,
|
/* The video subsystem is required for joystick input to work. However,
|
||||||
* when GHOST is running under SDL, video is freed elsewhere.
|
* when GHOST is running under SDL, video is freed elsewhere.
|
||||||
* Do this once only. */
|
* Do this once only. */
|
||||||
# ifdef WITH_GHOST_SDL
|
|
||||||
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
|
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
|
||||||
# else
|
|
||||||
SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO);
|
|
||||||
# endif
|
|
||||||
#endif /* WITH_SDL */
|
#endif /* WITH_SDL */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user