diff options
author | Mitchell Stokes <mogurijin@gmail.com> | 2011-11-25 01:16:27 +0400 |
---|---|---|
committer | Mitchell Stokes <mogurijin@gmail.com> | 2011-11-25 01:16:27 +0400 |
commit | 64008199b9e706b256a18a8c38605ade8b961293 (patch) | |
tree | ca1c195f38a010ebd77d913e68c552cd5e57f675 /source/gameengine/GamePlayer | |
parent | 04d1971a662c550bae84979565c2d5fce6136f94 (diff) |
Merging Blenderplayer modifier fix (U.gameflags |= USER_DISABLE_VBO) from Cucumber.
Diffstat (limited to 'source/gameengine/GamePlayer')
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index b1781f1703e..d6fb05f366e 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -365,7 +365,6 @@ int main(int argc, char** argv) GHOST_TEmbedderWindowID parentWindow = 0; bool isBlenderPlayer = false; int validArguments=0; - bool samplesParFound = false; GHOST_TUns16 aasamples = 0; #ifdef __linux__ @@ -407,7 +406,6 @@ int main(int argc, char** argv) initglobals(); - // Blender's VBOs cause odd problems with modifiers (we have our own vbo code) U.gameflags |= USER_DISABLE_VBO; // We load our own G.main, so free the one that initglobals() gives us free_main(G.main); @@ -584,14 +582,8 @@ int main(int argc, char** argv) break; case 'm': i++; - samplesParFound = true; if ((i+1) <= validArguments ) - aasamples = atoi(argv[i++]); - else - { - error = true; - printf("error: No argument supplied for -m"); - } + aasamples = atoi(argv[i++]); break; case 'c': i++; @@ -827,7 +819,7 @@ int main(int argc, char** argv) if ((!fullScreenParFound) && (!windowParFound)) { // Only use file settings when command line did not override - if ((scene->gm.playerflag & GAME_PLAYER_FULLSCREEN)) { + if (scene->gm.fullscreen) { //printf("fullscreen option found in Blender file\n"); fullScreen = true; fullScreenWidth= scene->gm.xplay; @@ -856,9 +848,6 @@ int main(int argc, char** argv) else scene->gm.stereoflag = STEREO_ENABLED; - if (!samplesParFound) - aasamples = scene->gm.aasamples; - if (stereoFlag == STEREO_DOME){ stereomode = RAS_IRasterizer::RAS_STEREO_DOME; scene->gm.stereoflag = STEREO_DOME; @@ -904,7 +893,7 @@ int main(int argc, char** argv) #endif { app.startFullScreen(fullScreenWidth, fullScreenHeight, fullScreenBpp, fullScreenFrequency, - stereoWindow, stereomode, aasamples, (scene->gm.playerflag & GAME_PLAYER_DESKTOP_RESOLUTION)); + stereoWindow, stereomode, aasamples); } } else |