merge from trunk #37722

1 files changed, 6 insertions, 0 deletions

diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 1436f18ae6c..0e3cfc58e09 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -416,6 +416,7 @@ int main(int argc, char** argv)
 
 	// We load our own G.main, so free the one that initglobals() gives us
 	free_main(G.main);
+	G.main = NULL;
 
 	IMB_init();
 
@@ -455,6 +456,9 @@ int main(int argc, char** argv)
 	U.audioformat = 0x24;
 	U.audiochannels = 2;
 
+	// XXX this one too
+	U.anisotropic_filter = 2;
+
 	sound_init_once();
 
 	/* if running blenderplayer the last argument can't be parsed since it has to be the filename. */
@@ -710,6 +714,8 @@ int main(int argc, char** argv)
 		{
 			GPU_set_mipmap(0);
 		}
+
+		GPU_set_anisotropic(U.anisotropic_filter);
 		
 		// Create the system
 		if (GHOST_ISystem::createSystem() == GHOST_kSuccess)