Mirrorlandia_minetest/irrlicht
1
0
Fork 1
mirror of https://github.com/minetest/irrlicht.git synced 2024-11-10 17:53:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add MaterialType in COpenGLSLMaterialRenderer::OnSetMaterial back in

Browse Source 
Shouldn't have been removed with last commit.
But adding some comments as it's slightly confusing.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6470 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2023-04-24 16:01:13 +00:00
parent c4bbbe1aaf
commit 37d821dcc3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/Irrlicht/COpenGLSLMaterialRenderer.cpp
View File

@ -237,10 +237,13 @@ void COpenGLSLMaterialRenderer::OnSetMaterial(const video::SMaterial& material,
COpenGLCacheHandler* cacheHandler = Driver->getCacheHandler(); COpenGLCacheHandler* cacheHandler = Driver->getCacheHandler();
if (Program2) if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates) // each program has it's own type
Driver->irrGlUseProgram(Program2); {
else if (Program) if (Program2)
Driver->extGlUseProgramObject(Program); Driver->irrGlUseProgram(Program2);
else if (Program)
Driver->extGlUseProgramObject(Program);
}
Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates); Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);