bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merging Blenderplayer modifier fix (U.gameflags |= USER_DISABLE_VBO) from Cucumber.

Browse Source
This commit is contained in:
Mitchell Stokes 2011-11-24 21:16:27 +00:00
parent 04d1971a66
commit 64008199b9
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
View File

@ -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