archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #29030: render operator only used scene property if layers was used, now it

Browse Source 
is possible to specify the scene without the layer too.
This commit is contained in:
Brecht Van Lommel
2011-10-26 14:05:01 +00:00
parent f09d36d6bc
commit ba0ef7a592
4 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,6 +365,7 @@ 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__
@@ -406,6 +407,8 @@ 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);
G.main = NULL;
@@ -581,8 +584,14 @@ int main(int argc, char** argv)
break;
case 'm':
i++;
samplesParFound = true;
if ((i+1) <= validArguments )
aasamples = atoi(argv[i++]);
aasamples = atoi(argv[i++]);
else
{
error = true;
printf("error: No argument supplied for -m");
}
break;
case 'c':
i++;
@@ -818,7 +827,7 @@ int main(int argc, char** argv)
if ((!fullScreenParFound) && (!windowParFound))
{
// Only use file settings when command line did not override
if (scene->gm.fullscreen) {
if ((scene->gm.playerflag & GAME_PLAYER_FULLSCREEN)) {
//printf("fullscreen option found in Blender file\n");
fullScreen = true;
fullScreenWidth= scene->gm.xplay;
@@ -847,6 +856,9 @@ 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;
@@ -892,7 +904,7 @@ int main(int argc, char** argv)
#endif
{
app.startFullScreen(fullScreenWidth, fullScreenHeight, fullScreenBpp, fullScreenFrequency,
stereoWindow, stereomode, aasamples);
stereoWindow, stereomode, aasamples, (scene->gm.playerflag & GAME_PLAYER_DESKTOP_RESOLUTION));
}
}
else