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

BGE Rasterizer Cleanup: Removing the Singletexture material mode. More conversion code will probably be needed.

Browse Source
This commit is contained in:
Mitchell Stokes
2013-11-04 19:21:50 +00:00
parent a35e9daaef
commit 0cec5c63da
15 changed files with 42 additions and 796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/gameengine/Ketsji/KX_PythonInit.cpp
View File

@@ -1226,7 +1226,6 @@ static PyObject *gPyGetGLSLMaterialSetting(PyObject *,
return PyLong_FromLong(enabled);
}
#define KX_TEXFACE_MATERIAL 0
#define KX_BLENDER_MULTITEX_MATERIAL 1
#define KX_BLENDER_GLSL_MATERIAL 2
@@ -1244,8 +1243,6 @@ static PyObject *gPySetMaterialType(PyObject *,
gs->matmode= GAME_MAT_GLSL;
else if (type == KX_BLENDER_MULTITEX_MATERIAL)
gs->matmode= GAME_MAT_MULTITEX;
else if (type == KX_TEXFACE_MATERIAL)
gs->matmode= GAME_MAT_TEXFACE;
else {
PyErr_SetString(PyExc_ValueError, "Rasterizer.setMaterialType(int): material type is not known");
return NULL;
@@ -1261,10 +1258,8 @@ static PyObject *gPyGetMaterialType(PyObject *)
if (gs->matmode == GAME_MAT_GLSL)
flag = KX_BLENDER_GLSL_MATERIAL;
else if (gs->matmode == GAME_MAT_MULTITEX)
flag = KX_BLENDER_MULTITEX_MATERIAL;
else
flag = KX_TEXFACE_MATERIAL;
flag = KX_BLENDER_MULTITEX_MATERIAL;
return PyLong_FromLong(flag);
}
@@ -2209,7 +2204,6 @@ PyObject *initRasterizer(RAS_IRasterizer* rasty,RAS_ICanvas* canvas)
Py_DECREF(ErrorObject);
/* needed for get/setMaterialType */
KX_MACRO_addTypesToDict(d, KX_TEXFACE_MATERIAL, KX_TEXFACE_MATERIAL);
KX_MACRO_addTypesToDict(d, KX_BLENDER_MULTITEX_MATERIAL, KX_BLENDER_MULTITEX_MATERIAL);
KX_MACRO_addTypesToDict(d, KX_BLENDER_GLSL_MATERIAL, KX_BLENDER_GLSL_MATERIAL);