Revision: 37862
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37862
Author: blendix
Date: 2011-06-27 14:06:11 +0000 (Mon, 27 Jun 2011)
Log Message:
-----------
Fix part of #26850: OS X game player was showing _NSAutoreleaseNoPool()
error messages on start. These were coming from initializing the SDL video
subsystem as part of Joystick init. We do not need this, as video stuff is
covered by GHOST, most likely this was conflicting.
Modified Paths:
--------------
trunk/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
Modified: trunk/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
2011-06-27 13:57:27 UTC (rev 37861)
+++ trunk/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
2011-06-27 14:06:11 UTC (rev 37862)
@@ -89,7 +89,7 @@
{
int i;
// do this once only
- if(SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO ) == -1
){
+ if(SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1 ){
echo("Error-Initializing-SDL: " << SDL_GetError());
return NULL;
}
@@ -124,7 +124,7 @@
m_instance[i]= NULL;
}
- SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO );
+ SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
#endif
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs