luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/Irrlicht/COGLESMaterialRenderer.h
View File

@@ -450,7 +450,7 @@ public:
}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{
Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
@@ -464,7 +464,7 @@ public:
}
}
virtual void OnUnsetMaterial() _IRR_OVERRIDE_
virtual void OnUnsetMaterial() IRR_OVERRIDE
{
Driver->getCacheHandler()->setActiveTexture(GL_TEXTURE1);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);