MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly reset renderstate. Remove extra no-op. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1083 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2007-12-03 10:08:36 +00:00
parent cce97d491e
commit 7e0bcfcf50
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Irrlicht/COgreMeshFileLoader.h
View File

@ -135,7 +135,7 @@ private:
struct OgreVertexBuffer
{
OgreVertexBuffer() : BindIndex(0), VertexSize(0), Data(0) {}
void destroy() { delete [] Data; Data = 0; };
void destroy() { delete [] Data; Data = 0; }
u16 BindIndex,
VertexSize;

2
source/Irrlicht/COpenGLMaterialRenderer.h
View File

@ -446,9 +446,11 @@ public:
if (Driver->queryFeature(EVDF_MULTITEXTURE))
{
Driver->extGlActiveTexture(GL_TEXTURE1_ARB);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 1.f );
Driver->extGlActiveTexture(GL_TEXTURE0_ARB);
}
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
}
};