[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16920] trunk/blender/source/gameengine/ BlenderRoutines/BL_KetsjiEmbedStart.cpp: Bugfix: modified game material settings in blender didn't get
Brecht Van Lommel
brecht at blender.org
Sat Oct 4 19:04:24 CEST 2008
Revision: 16920
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16920
Author: blendix
Date: 2008-10-04 19:04:23 +0200 (Sat, 04 Oct 2008)
Log Message:
-----------
Bugfix: modified game material settings in blender didn't get
taken into account when loading a new .blend.
Modified Paths:
--------------
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
Modified: trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2008-10-04 16:42:36 UTC (rev 16919)
+++ trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2008-10-04 17:04:23 UTC (rev 16920)
@@ -135,16 +135,7 @@
bool frameRate = (SYS_GetCommandLineInt(syshandle, "show_framerate", 0) != 0);
bool game2ipo = (SYS_GetCommandLineInt(syshandle, "game2ipo", 0) != 0);
bool displaylists = (SYS_GetCommandLineInt(syshandle, "displaylists", 0) != 0);
- bool usemat = false, useglslmat = false;
- if(GLEW_ARB_multitexture && GLEW_VERSION_1_1)
- usemat = (SYS_GetCommandLineInt(syshandle, "blender_material", 1) != 0);
-
- if(GPU_extensions_minimum_support())
- useglslmat = (SYS_GetCommandLineInt(syshandle, "blender_glsl_material", 1) != 0);
- else if(G.fileflags & G_FILE_GAME_MAT_GLSL)
- usemat = false;
-
// create the canvas, rasterizer and rendertools
RAS_ICanvas* canvas = new KX_BlenderCanvas(area);
canvas->SetMouseState(RAS_ICanvas::MOUSE_INVISIBLE);
@@ -316,10 +307,18 @@
if (always_use_expand_framing)
sceneconverter->SetAlwaysUseExpandFraming(true);
- if(usemat && (G.fileflags & G_FILE_GAME_MAT))
- sceneconverter->SetMaterials(true);
- if(useglslmat && (G.fileflags & G_FILE_GAME_MAT_GLSL))
- sceneconverter->SetGLSLMaterials(true);
+ bool usemat = false, useglslmat = false;
+
+ if(GLEW_ARB_multitexture && GLEW_VERSION_1_1)
+ usemat = true;
+
+ if(GPU_extensions_minimum_support())
+ useglslmat = true;
+ else if(G.fileflags & G_FILE_GAME_MAT_GLSL)
+ usemat = false;
+
+ sceneconverter->SetMaterials(usemat && (G.fileflags & G_FILE_GAME_MAT));
+ sceneconverter->SetGLSLMaterials(useglslmat && (G.fileflags & G_FILE_GAME_MAT_GLSL));
KX_Scene* startscene = new KX_Scene(keyboarddevice,
mousedevice,
More information about the Bf-blender-cvs
mailing list