diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 18:07:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 18:07:38 +0400 |
| commit | fa01eef27e1a03aeba438e10ae11230f07ff0fb6 (patch) | |
| tree | 5c2cd5e69eeabe3d94510e0f33193d91d65c2351 /source/gameengine/GameLogic | |
| parent | b592b6e8be051d590a6fa1806d44809c75df6515 (diff) | |
| parent | b40eb540d3a49c710bbd10effa9d9db04a915347 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20849:20855
to get the BGE building with py3k and no sdl
Diffstat (limited to 'source/gameengine/GameLogic')
| -rw-r--r-- | source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp index d83179d4f80..6140702534c 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp +++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp @@ -158,12 +158,13 @@ bool SCA_Joystick::aAxisIsPositive(int axis_single) bool SCA_Joystick::aAnyButtonPressIsPositive(void) { +#ifndef DISABLE_SDL /* this is needed for the "all events" option * so we know if there are no buttons pressed */ for (int i=0; i<m_buttonmax; i++) if (SDL_JoystickGetButton(m_private->m_joystick, i)) return true; - +#endif return false; } |