1
0

Merging r6107 through r6116 from trunk to ogl-es branch

Caught up with trunk again.
Not yet tested beside compiling (quick test failed, but seems like nothing from the new changes).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6117 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2020-06-12 20:47:40 +00:00
parent 20b3d56987
commit 562c0fb6f1
13 changed files with 277 additions and 319 deletions

View File

@@ -34,7 +34,7 @@ private:
//! constructor
burning_shader_class::burning_shader_color(CBurningVideoDriver* driver)
burning_shader_class::burning_shader_class(CBurningVideoDriver* driver)
: IBurningShader(driver)
{
#ifdef _DEBUG